Merge branch 'ap/maint-apply-modefix'

diff --git a/t/t6007-rev-list-cherry-pick-file.sh b/t/t6007-rev-list-cherry-pick-file.sh
index 3faeae6c01688069220e6dc5b200fbb1d04a05fd..4b8611ce2092f9062aeaeb62ce19a9121d5be537 100755 (executable)
--- 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