stash: handle staged changes in skip-worktree files correctly

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

diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index b22e671608119d37dd73bf6b0df41ce62e1a26f9..1e977145b83766d86561f5838d87d59fb8c3b2b4 100755 (executable)
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -1234,4 +1234,22 @@ 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_expect_success 'stash handles skip-worktree entries nicely' '
+       test_commit A &&
+       echo changed >A.t &&
+       git add A.t &&
+       git update-index --skip-worktree A.t &&
+       rm A.t &&
+       git stash &&
+
+       git rev-parse --verify refs/stash:A.t
+'
+
 test_done