Merge branch 'js/update-index-ignore-removal-for-skip-worktree'

[thirdparty/git.git] / t / t7012-skip-worktree-writing.sh

diff --git a/t/t7012-skip-worktree-writing.sh b/t/t7012-skip-worktree-writing.sh
index 9d1abe50eff6772673df545d3e6715d4d2e6f2db..7476781979c3ff164ce9eeba1079d41f15bdaa5c 100755 (executable)
--- a/t/t7012-skip-worktree-writing.sh
+++ b/t/t7012-skip-worktree-writing.sh
@@ -134,6 +134,21 @@ test_expect_success 'git-clean, dirty case' '
        test_i18ncmp expected result
 '
 
+test_expect_success '--ignore-skip-worktree-entries leaves worktree alone' '
+       test_commit keep-me &&
+       git update-index --skip-worktree keep-me.t &&
+       rm keep-me.t &&
+
+       : ignoring the worktree &&
+       git update-index --remove --ignore-skip-worktree-entries keep-me.t &&
+       git diff-index --cached --exit-code HEAD &&
+
+       : not ignoring the worktree, a deletion is staged &&
+       git update-index --remove keep-me.t &&
+       test_must_fail git diff-index --cached --exit-code HEAD \
+               --diff-filter=D -- keep-me.t
+'
+
 #TODO test_expect_failure 'git-apply adds file' false
 #TODO test_expect_failure 'git-apply updates file' false
 #TODO test_expect_failure 'git-apply removes file' false