diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-25 20:59:23 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-25 20:59:23 (GMT) |
| commit | f8aee8576ac5e01fa993c80b5b888af214c03758 (patch) | |
| tree | efd02db445dc51f284d3afddcefd9dcd7e5ac6c1 /t/t3903-stash.sh | |
| parent | 984da7f8d2589b53cca7c920e597eab30d4c1b36 (diff) | |
| parent | b932f6a5e8cdbb33eff4563fdfb1eae9ebf70a65 (diff) | |
| download | git-f8aee8576ac5e01fa993c80b5b888af214c03758.zip git-f8aee8576ac5e01fa993c80b5b888af214c03758.tar.gz git-f8aee8576ac5e01fa993c80b5b888af214c03758.tar.bz2 | |
Merge branch 'tg/stash-keep-index-with-removed-paths'
"git stash --keep-index" did not work correctly on paths that have
been removed, which has been fixed.
* tg/stash-keep-index-with-removed-paths:
stash: fix handling removed files with --keep-index
Diffstat (limited to 't/t3903-stash.sh')
| -rwxr-xr-x | t/t3903-stash.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index b22e671..b8e3378 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -1234,4 +1234,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 |