summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamkumar Ramachandra <artagnon@gmail.com>2013-06-24 12:45:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-24 17:25:49 (GMT)
commitf0915cbaf476d63f72c284057680809ed24fbe0d (patch)
tree404617f03384c8dbe5035a288ea67c1b8de10ebe
parentec85d0700faac679ec27eeacad2bcaa6d9bc8322 (diff)
downloadgit-f0915cbaf476d63f72c284057680809ed24fbe0d.zip
git-f0915cbaf476d63f72c284057680809ed24fbe0d.tar.gz
git-f0915cbaf476d63f72c284057680809ed24fbe0d.tar.bz2
commit: make it work with status.short
With "status.short" set, it is now impossible to commit with status.short set, because it acts like "git commit --short", and it is impossible to differentiate between a status_format set by the command-line option parser versus that set by the config parser. To alleviate this problem, clear status_format as soon as the config parser has finished its work. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/commit.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/commit.c b/builtin/commit.c
index d6c8e20..0da944f 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1441,6 +1441,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
wt_status_prepare(&s);
gitmodules_config();
git_config(git_commit_config, &s);
+ status_format = STATUS_FORMAT_NONE; /* Ignore status.short */
determine_whence(&s);
s.colopts = 0;