Skip to content

Commit 40ae3d3

Browse files
peffgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 2008f29 commit 40ae3d3

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

bisect.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -901,8 +901,8 @@ static void show_diff_tree(struct repository *r,
901901
};
902902
struct rev_info opt;
903903

904-
repo_init_revisions(r, &opt, prefix);
905904
git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
905+
repo_init_revisions(r, &opt, prefix);
906906

907907
setup_revisions(ARRAY_SIZE(argv) - 1, argv, &opt, NULL);
908908
log_tree_commit(&opt, commit);

0 commit comments

Comments
 (0)