X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6007-rev-list-cherry-pick-file.sh;h=4b8611ce2092f9062aeaeb62ce19a9121d5be537;hb=ac083c47ea226b470afab39d975e718a475a3c78;hp=3faeae6c01688069220e6dc5b200fbb1d04a05fd;hpb=f16eb1f6a3f9a1a09a61f0cd07e9c9ff9ee54530;p=git.git

diff --git a/t/t6007-rev-list-cherry-pick-file.sh b/t/t6007-rev-list-cherry-pick-file.sh
index 3faeae6c0..4b8611ce2 100755
--- a/t/t6007-rev-list-cherry-pick-file.sh
+++ b/t/t6007-rev-list-cherry-pick-file.sh
@@ -40,4 +40,18 @@ test_expect_success '--cherry-pick bar does not come up empty' '
 	! test -z "$(git rev-list --left-right --cherry-pick B...C -- bar)"
 '
 
+test_expect_success '--cherry-pick with independent, but identical branches' '
+	git symbolic-ref HEAD refs/heads/independent &&
+	rm .git/index &&
+	echo Hallo > foo &&
+	git add foo &&
+	test_tick &&
+	git commit -m "independent" &&
+	echo Bello > foo &&
+	test_tick &&
+	git commit -m "independent, too" foo &&
+	test -z "$(git rev-list --left-right --cherry-pick \
+		HEAD...master -- foo)"
+'
+
 test_done