development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 19:49:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jk/maint-commit-amend-only-no-paths' into maint

Browse source 
"git commit --amend --only --" was meant to allow "Clever" people to
rewrite the commit message without making any change even when they
have already changes for the next commit added to their index, but
it never worked as advertised since it was introduced in 1.3.0 era.

* jk/maint-commit-amend-only-no-paths:
  commit: fix "--amend --only" with no pathspec
This commit is contained in:
Junio C Hamano 2012-07-22 13:03:29 -07:00
parent 1cd2913960 ea2d4ed359
commit f5a8400960
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
builtin/commit.c
View file

@ -184,6 +184,9 @@ static int list_paths(struct string_list *list, const char *with_tree,
int i;
char *m;
if (!pattern)
return 0;
for (i = 0; pattern[i]; i++)
;
m = xcalloc(1, i);
@ -345,7 +348,7 @@ static char *prepare_index(int argc, const char **argv, const char *prefix,
* and create commit from the_index.
* We still need to refresh the index here.
*/
if (!pathspec || !*pathspec) {
if (!only && (!pathspec || !*pathspec)) {
fd = hold_locked_index(&index_lock, 1);
refresh_cache_or_die(refresh_flags);
if (active_cache_changed) {

10
t/t7501-commit.sh
View file

@ -108,6 +108,16 @@ test_expect_success 'amend commit' '
EDITOR=./editor git commit --amend
'
test_expect_success 'amend --only ignores staged contents' '
cp file file.expect &&
echo changed >file &&
git add file &&
git commit --no-edit --amend --only &&
git cat-file blob HEAD:file >file.actual &&
test_cmp file.expect file.actual &&
git diff --exit-code
'
test_expect_success 'set up editor' '
cat >editor <<-\EOF &&
#!/bin/sh