From b932f6a5e8cdbb33eff4563fdfb1eae9ebf70a65 Mon Sep 17 00:00:00 2001 From: Thomas Gummerer Date: Tue, 16 Jul 2019 15:23:22 +0100 Subject: stash: fix handling removed files with --keep-index git stash push --keep-index is supposed to keep all changes that have been added to the index, both in the index and on disk. Currently this doesn't behave correctly when a file is removed from the index. Instead of keeping it deleted on disk, --keep-index currently restores the file. Fix that behaviour by using 'git checkout' in no-overlay mode which can faithfully restore the index and working tree. This also simplifies the code. Note that this will overwrite untracked files if the untracked file has the same name as a file that has been deleted in the index. Signed-off-by: Thomas Gummerer Signed-off-by: Junio C Hamano --- t/t3903-stash.sh | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 't') diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index ea30d5f6a0..151cd497be 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -1216,4 +1216,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 -- cgit v1.2.3