Merge branch 'jc/merge-sans-branch'

diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh
index bc7aedd0484ed5ad1115cac0f22943445d658f47..753a6c972cda61d2da3d2ecf7bd9c231004d6ad0 100755 (executable)
--- a/t/t3501-revert-cherry-pick.sh
+++ b/t/t3501-revert-cherry-pick.sh
@@ -81,7 +81,17 @@ test_expect_success 'revert after renaming branch' '
 
 '
 
-test_expect_success 'revert forbidden on dirty working tree' '
+test_expect_success 'cherry-pick on stat-dirty working tree' '
+       git clone . copy &&
+       (
+               cd copy &&
+               git checkout initial &&
+               test-chmtime +40 oops &&
+               git cherry-pick added
+       )
+'
+
+test_expect_success C_LOCALE_OUTPUT 'revert forbidden on dirty working tree' '
 
        echo content >extra_file &&
        git add extra_file &&