summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-05-23 14:38:23 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-05-23 14:38:23 +0900
commit1e174fdbe6b0bea58d20e451ca66a1bbb5829307 (patch)
treee919fa5a15255d9d87fb2ad5d01eb31e5c1b0e7d /builtin
parentMerge branch 'cc/perf-bisect' (diff)
parentwt-status: use settings from git_diff_ui_config (diff)
downloadtgif-1e174fdbe6b0bea58d20e451ca66a1bbb5829307.tar.xz
Merge branch 'em/status-rename-config'
"git status" learned to pay attention to UI related diff configuration variables such as diff.renames. * em/status-rename-config: wt-status: use settings from git_diff_ui_config
Diffstat (limited to 'builtin')
-rw-r--r--builtin/commit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/commit.c b/builtin/commit.c
index 5571d4a3e2..5240f11225 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -161,9 +161,9 @@ static void determine_whence(struct wt_status *s)
static void status_init_config(struct wt_status *s, config_fn_t fn)
{
wt_status_prepare(s);
+ init_diff_ui_defaults();
git_config(fn, s);
determine_whence(s);
- init_diff_ui_defaults();
s->hints = advice_status_hints; /* must come after git_config() */
}