summaryrefslogtreecommitdiff
path: root/wt-status.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-24 18:41:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-24 19:49:53 (GMT)
commit84b4202d804c7faec76f3eab22744b6288c63481 (patch)
tree153bb40aa5ef37955e39a70cbb3365576843bc64 /wt-status.c
parentf0915cbaf476d63f72c284057680809ed24fbe0d (diff)
downloadgit-84b4202d804c7faec76f3eab22744b6288c63481.zip
git-84b4202d804c7faec76f3eab22744b6288c63481.tar.gz
git-84b4202d804c7faec76f3eab22744b6288c63481.tar.bz2
status/commit: make sure --porcelain is not affected by user-facing config
The recent addition of status.branch started affecting what is shown when "git status --porcelain" is run by mistake. Identify the configuration items that should be ignored under "--porcelain" option, introduce a "deferred config" mechanism to keep the values read from the configuration, and decide what value to use only after we read both from configuration and command line. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'wt-status.c')
-rw-r--r--wt-status.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/wt-status.c b/wt-status.c
index bf84a86..6778755 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -127,6 +127,7 @@ void wt_status_prepare(struct wt_status *s)
s->change.strdup_strings = 1;
s->untracked.strdup_strings = 1;
s->ignored.strdup_strings = 1;
+ s->show_branch = -1; /* unspecified */
}
static void wt_status_print_unmerged_header(struct wt_status *s)