Merge branch 'pb/maint-git-pm-false-dir'

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index e0ded197ecabce712ac1eeaa4c959c714f0e9d34..7d10a27f1dcb8058f0e3c6180c3d45705fe3b21d 100755 (executable)
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -419,4 +419,15 @@ test_expect_success 'rebase with a file named HEAD in worktree' '
 
 '
 
+test_expect_success 'do "noop" when there is nothing to cherry-pick' '
+
+       git checkout -b branch4 HEAD &&
+       GIT_EDITOR=: git commit --amend \
+               --author="Somebody else <somebody@else.com>" 
+       test $(git rev-parse branch3) != $(git rev-parse branch4) &&
+       git rebase -i branch3 &&
+       test $(git rev-parse branch3) = $(git rev-parse branch4)
+
+'
+
 test_done