From: Charles Bailey Date: Thu, 15 Apr 2010 00:24:21 GMT Subject: [PATCH 1/2] (resend) stash bug: stash can lose data in a file removed from the index Message-ID: <1271291062-32154-1-git-send-email-charles@hashpling.org> If a file is removed from the index and then modified in the working tree then stash will discard the working tree file with no way to recover the changes. This can might be done in one of a number of ways. git rm file vi file # edit a new version git stash or with git mv git mv file newfile vi file # make a new file with the old name git stash Signed-off-by: Charles Bailey --- t/t3903-stash.sh | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index 476e5ec..c85bf44 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -228,4 +228,13 @@ test_expect_success 'stash --invalid-option' ' test bar,bar2 = $(cat file),$(cat file2) ' +test_expect_failure 'stash git rm' ' + git reset --hard && + git rm file && + echo bar7 > file && + git stash && + git stash apply && + test bar7 = $(cat file) +' + test_done -- 1.7.1.rc1.241.g4e72f