Merge branch 'master' of git://ozlabs.org/~paulus/gitk

diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index b22e671608119d37dd73bf6b0df41ce62e1a26f9..b8e337893f3e1e505da94b0c3f0b743ece622f10 100755 (executable)
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -1234,4 +1234,11 @@ test_expect_success 'stash works when user.name and user.email are not set' '
        )
 '
 
+test_expect_success 'stash --keep-index with file deleted in index does not resurrect it on disk' '
+       test_commit to-remove to-remove &&
+       git rm to-remove &&
+       git stash --keep-index &&
+       test_path_is_missing to-remove
+'
+
 test_done