diff options
author | Jeff King <peff@peff.net> | 2019-02-22 07:21:33 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-02-28 23:31:37 +0100 |
commit | 40ae3d3eeae95f201d5532cb114266ad8f6d4130 (patch) | |
tree | e51d8b6aecabe8827b689d44275a93b9fb5cd17c /bisect.c | |
parent | bisect: use string arguments to feed internal diff-tree (diff) | |
download | git-40ae3d3eeae95f201d5532cb114266ad8f6d4130.tar.xz git-40ae3d3eeae95f201d5532cb114266ad8f6d4130.zip |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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); |