From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Oct 2016 20:14:46 +0000 (-0700)
Subject: Merge branch 'jk/merge-base-fork-point-without-reflog'
X-Git-Tag: v2.11.0-rc0~39
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/92657ea597310c05b8f4ac3496ba90496286b5d6?hp=-c

Merge branch 'jk/merge-base-fork-point-without-reflog'

"git rebase" immediately after "git clone" failed to find the fork
point from the upstream.

* jk/merge-base-fork-point-without-reflog:
merge-base: handle --fork-point without reflog
---

92657ea597310c05b8f4ac3496ba90496286b5d6
diff --combined t/t6010-merge-base.sh
index e0c5f44cac,de3bf0741c..31db7b5f91
--- a/t/t6010-merge-base.sh
+++ b/t/t6010-merge-base.sh
@@@ -215,13 -215,11 +215,13 @@@ test_expect_success 'criss-cross merge-
  	git reset --hard E &&
  	test_commit CC2 &&
  	test_tick &&
 -	git merge -s ours CC1 &&
 +	# E is a root commit unrelated to MMR root on which CC1 is based
 +	git merge -s ours --allow-unrelated-histories CC1 &&
  	test_commit CC-o &&
  	test_commit CCB &&
  	git reset --hard CC1 &&
 -	git merge -s ours CC2 &&
 +	# E is a root commit unrelated to MMR root on which CC1 is based
 +	git merge -s ours --allow-unrelated-histories CC2 &&
  	test_commit CCA &&
  
  	git rev-parse CC1 CC2 >expected &&
@@@ -260,6 -258,12 +260,12 @@@ test_expect_success 'using reflog to fi
  	test_cmp expect3 actual
  '
  
+ test_expect_success '--fork-point works with empty reflog' '
+ 	git -c core.logallrefupdates=false branch no-reflog base &&
+ 	git merge-base --fork-point no-reflog derived &&
+ 	test_cmp expect3 actual
+ '
+ 
  test_expect_success 'merge-base --octopus --all for complex tree' '
  	# Best common ancestor for JE, JAA and JDD is JC
  	#             JE