summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-11 10:44:11 -0700
committerJunio C Hamano <gitster@pobox.com>2016-07-11 10:44:11 -0700
commitb8530304433264436fb9ad7d7afb8441a51b8a27 (patch)
tree44a1e1bd3e3884fa132e01a9bf3941c89b33083e
parent1401236842d871e3a40d5c40e7914b6ef8908899 (diff)
parent43ec55091553658e4cfb1d927ff2a0fb50a8fdba (diff)
downloadgit-b8530304433264436fb9ad7d7afb8441a51b8a27.tar.gz
Merge branch 'jk/bisect-show-tree' into maint
"git bisect" makes an internal call to "git diff-tree" when bisection finds the culprit, but this call did not initialize the data structure to pass to the diff-tree API correctly. * jk/bisect-show-tree: bisect: always call setup_revisions after init_revisions
-rw-r--r--bisect.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/bisect.c b/bisect.c
index 6d93edbcb9..dc13319c20 100644
--- a/bisect.c
+++ b/bisect.c
@@ -890,6 +890,7 @@ static void show_diff_tree(const char *prefix, struct commit *commit)
if (!opt.diffopt.output_format)
opt.diffopt.output_format = DIFF_FORMAT_RAW;
+ setup_revisions(0, NULL, &opt, NULL);
log_tree_commit(&opt, commit);
}