Merge branch 'cc/svn-fe-py-shebang'

[thirdparty/git.git] / t / t3903-stash.sh

diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 820b350aeb6a6a9162e1ba03543a1260e6d34b3c..580bfbdc23f4924cea78358629e09a974ad6aa6c 100755 (executable)
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -1253,4 +1253,20 @@ test_expect_success 'stash --keep-index with file deleted in index does not resu
        test_path_is_missing to-remove
 '
 
+test_expect_success 'stash apply should succeed with unmodified file' '
+       echo base >file &&
+       git add file &&
+       git commit -m base &&
+
+       # now stash a modification
+       echo modified >file &&
+       git stash &&
+
+       # make the file stat dirty
+       cp file other &&
+       mv other file &&
+
+       git stash apply
+'
+
 test_done