X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=t%2Ft6010-merge-base.sh;h=0144d9e858d2d8bf1720331c52f1809ed36e81b0;hb=e38d1c555e56a9b19f69250f22d2965b621a04af;hp=79124ec761a90fd0e2f028b4566fd21947ba5490;hpb=30ca4ca7b25082574d93b3a6d46a966d39de0488;p=git.git

diff --git a/t/t6010-merge-base.sh b/t/t6010-merge-base.sh
index 79124ec76..0144d9e85 100755
--- a/t/t6010-merge-base.sh
+++ b/t/t6010-merge-base.sh
@@ -149,6 +149,12 @@ test_expect_success 'merge-base A B C' '
 	test "$MM1" = "$MB"
 '
 
+test_expect_success 'merge-base A B C using show-branch' '
+	MB=$(git show-branch --merge-base MMA MMB MMC) &&
+	MMR=$(git rev-parse --verify MMR) &&
+	test "$MMR" = "$MB"
+'
+
 test_expect_success 'criss-cross merge-base for octopus-step (setup)' '
 	git reset --hard MMR &&
 	test_tick && git commit --allow-empty -m 1 && git tag CC1 &&