summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-10-18 10:19:08 +0900
committerJunio C Hamano <gitster@pobox.com>2017-10-18 10:19:08 +0900
commit1c0b983a777bf283250aaf00c94a9a9d4bf8bc9c (patch)
treeda278177d16ce137f6b19de518b149ba6edcbdca /diff.c
parent570676e011d9c8057744e03067553c4802e5adb4 (diff)
parentb521fd122865dca88b99d05344ec189d39efcefb (diff)
downloadgit-1c0b983a777bf283250aaf00c94a9a9d4bf8bc9c.tar.gz
Merge branch 'jk/ref-filter-colors-fix'
This is the "theoretically more correct" approach of simply stepping back to the state before plumbing commands started paying attention to "color.ui" configuration variable. Let's run with this one. * jk/ref-filter-colors-fix: tag: respect color.ui config Revert "color: check color.ui in git_default_config()" Revert "t6006: drop "always" color config tests" Revert "color: make "always" the same as "auto" in config"
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/diff.c b/diff.c
index d76bb937c1..6fd288420b 100644
--- a/diff.c
+++ b/diff.c
@@ -358,6 +358,9 @@ int git_diff_ui_config(const char *var, const char *value, void *cb)
return 0;
}
+ if (git_color_config(var, value, cb) < 0)
+ return -1;
+
return git_diff_basic_config(var, value, cb);
}