summaryrefslogtreecommitdiff
path: root/sha1-lookup.c
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2016-10-12 16:10:40 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-10-12 14:30:16 -0700
commit4f21454b55f4237b7d0487ad5099c9edf4fc3967 (patch)
tree823ab289135da04b10f02367e2e73777e83cb54f /sha1-lookup.c
parentGit 2.8.4 (diff)
downloadtgif-4f21454b55f4237b7d0487ad5099c9edf4fc3967.tar.xz
merge-base: handle --fork-point without reflog
The --fork-point option looks in the reflog to try to find where a derived branch forked from a base branch. However, if the reflog for the base branch is totally empty (as it commonly is right after cloning, which does not write a reflog entry), then our for_each_reflog call will not find any entries, and we will come up with no merge base, even though there may be one with the current tip of the base. We can fix this by just adding the current tip to our list of collected entries. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1-lookup.c')
0 files changed, 0 insertions, 0 deletions