summaryrefslogtreecommitdiff
path: root/bisect.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2019-02-22 06:21:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-02-28 22:31:37 (GMT)
commit40ae3d3eeae95f201d5532cb114266ad8f6d4130 (patch)
treee51d8b6aecabe8827b689d44275a93b9fb5cd17c /bisect.c
parent2008f29093ba46e513ca2af7f14f3b75faa7a358 (diff)
downloadgit-40ae3d3eeae95f201d5532cb114266ad8f6d4130.zip
git-40ae3d3eeae95f201d5532cb114266ad8f6d4130.tar.gz
git-40ae3d3eeae95f201d5532cb114266ad8f6d4130.tar.bz2
bisect: fix internal diff-tree config loading
When we run our internal diff-tree to show the bisected commit, we call init_revisions(), then load config, then setup_revisions(). But that order is wrong: we copy the configured defaults into the rev_info struct during the init_revisions step, so our config load wasn't actually doing anything. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'bisect.c')
-rw-r--r--bisect.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/bisect.c b/bisect.c
index 8c81859..b04d7b2 100644
--- a/bisect.c
+++ b/bisect.c
@@ -901,8 +901,8 @@ static void show_diff_tree(struct repository *r,
};
struct rev_info opt;
- repo_init_revisions(r, &opt, prefix);
git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
+ repo_init_revisions(r, &opt, prefix);
setup_revisions(ARRAY_SIZE(argv) - 1, argv, &opt, NULL);
log_tree_commit(&opt, commit);