summaryrefslogtreecommitdiff
path: root/wt-status.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-11 20:05:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-07-11 20:05:34 (GMT)
commite29497d28ce1ec9f76493542fcab4a8d61ca5fce (patch)
tree55d90189d8c1d3acb829a983f4aae292a8d4d7bf /wt-status.c
parent04ce89389d37097da250c9879bddc9f59443a704 (diff)
parent84b4202d804c7faec76f3eab22744b6288c63481 (diff)
downloadgit-e29497d28ce1ec9f76493542fcab4a8d61ca5fce.zip
git-e29497d28ce1ec9f76493542fcab4a8d61ca5fce.tar.gz
git-e29497d28ce1ec9f76493542fcab4a8d61ca5fce.tar.bz2
Merge branch 'jg/status-config'
"git status" learned status.branch and status.short configuration variables to use --branch and --short options by default (override with --no-branch and --no-short options from the command line). * jg/status-config: status/commit: make sure --porcelain is not affected by user-facing config commit: make it work with status.short status: introduce status.branch to enable --branch by default status: introduce status.short to enable --short by default
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 72db290..9c4d086 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)