diff options
| author |  Ramkumar Ramachandra <artagnon@gmail.com> | 2013-06-24 18:15:12 +0530 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-06-24 10:25:49 -0700 |
| commit | f0915cbaf476d63f72c284057680809ed24fbe0d (patch) | |
| tree | 404617f03384c8dbe5035a288ea67c1b8de10ebe | |
| parent | status: introduce status.branch to enable --branch by default (diff) | |
| download | tgif-f0915cbaf476d63f72c284057680809ed24fbe0d.tar.xz | |
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.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index d6c8e204ee..0da944fa4e 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; |