Merge branch 'rj/warning-uninitialized-fix'

diff --git a/t/t6010-merge-base.sh b/t/t6010-merge-base.sh
index e0c5f44cac0290c6e15c5360b0cc7c1f4d486614..31db7b5f9125ed346450d7bfe29d8bb5fac0460a 100755 (executable)
--- 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