Merge pull request #2378 from dscho/fix-stash-with-skip-worktree

Fix `git stash` with skip-worktree entries

Author: dscho

t/t7012-skip-worktree-writing.sh

@@ -135,17 +135,18 @@ test_expect_success 'git-clean, dirty case' '
 '
 
 test_expect_success '--ignore-skip-worktree-entries leaves worktree alone' '
-	test_commit geroff-me &&
-	git update-index --skip-worktree geroff-me.t &&
-	rm geroff-me.t &&
+	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 geroff-me.t &&
+	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 geroff-me.t &&
-	test_must_fail git diff-index --cached --exit-code HEAD
+	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