summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-07-06 13:38:10 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-07-06 13:38:10 -0700
commitf1e80a12a485c1d3092cef96aa4a101405d326f9 (patch)
treeb64e10d20855f734829273c7879b96cc738708dd
parentMerge branch 'lf/sideband-returns-void' (diff)
parentbisect: always call setup_revisions after init_revisions (diff)
downloadtgif-f1e80a12a485c1d3092cef96aa4a101405d326f9.tar.xz
Merge branch 'jk/bisect-show-tree'
"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);
}