diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-10-28 09:01:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-28 09:01:17 -0700 |
| commit | 96ec83ce5207be0aac3c1df1ac92356f9de9ad81 (patch) | |
| tree | 2fd2924a0023333772153f04fe654fbd8641e5b3 /t | |
| parent | a5406125cc3989a7007d4fad7e5757cdb9837ebf (diff) | |
| parent | 4f21454b55f4237b7d0487ad5099c9edf4fc3967 (diff) | |
| download | git-96ec83ce5207be0aac3c1df1ac92356f9de9ad81.tar.gz | |
Merge branch 'jk/merge-base-fork-point-without-reflog' into maint
"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
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6010-merge-base.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t6010-merge-base.sh b/t/t6010-merge-base.sh index e0c5f44cac..31db7b5f91 100755 --- a/t/t6010-merge-base.sh +++ b/t/t6010-merge-base.sh @@ -260,6 +260,12 @@ test_expect_success 'using reflog to find the fork point' ' 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 |