summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-07-16 04:39:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-07-16 04:39:48 (GMT)
commitb9a0801ad0222256e2ddbf38d8bcce9f32e0211c (patch)
tree3aeddda7fd01f6c48a5bfaba63dcdfaad6348bcf /builtin
parent8647b585d899bc7458fbc5c12c2c44331da5b4c0 (diff)
parentea2d4ed35902ce15959965ab86d80527731a177c (diff)
downloadgit-b9a0801ad0222256e2ddbf38d8bcce9f32e0211c.zip
git-b9a0801ad0222256e2ddbf38d8bcce9f32e0211c.tar.gz
git-b9a0801ad0222256e2ddbf38d8bcce9f32e0211c.tar.bz2
Merge branch 'jk/maint-commit-amend-only-no-paths'
"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
Diffstat (limited to 'builtin')
-rw-r--r--builtin/commit.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/builtin/commit.c b/builtin/commit.c
index 6515da2..95eeab1 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -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) {