diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-01-23 21:16:39 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-23 21:16:39 (GMT) |
| commit | 087d1a8e9c49e5c11008582e92f346680d0d8c89 (patch) | |
| tree | dd235b2a555cc10a37906ae9bd58abc5e23360f6 /t/t3903-stash.sh | |
| parent | f0605836b7411e700e980122f684d7e788e33a3f (diff) | |
| parent | bba067d2faf047597bc76f885fb0cf87894b5ed1 (diff) | |
| download | git-087d1a8e9c49e5c11008582e92f346680d0d8c89.zip git-087d1a8e9c49e5c11008582e92f346680d0d8c89.tar.gz git-087d1a8e9c49e5c11008582e92f346680d0d8c89.tar.bz2 | |
Merge branch 'tg/stash-with-pathspec-fix'
"git stash -- <pathspec>" incorrectly blew away untracked files in
the directory that matched the pathspec, which has been corrected.
* tg/stash-with-pathspec-fix:
stash: don't delete untracked files that match pathspec
Diffstat (limited to 't/t3903-stash.sh')
| -rwxr-xr-x | t/t3903-stash.sh | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index 39c7f2e..aefde7b 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -1064,4 +1064,36 @@ test_expect_success 'stash -k -- <pathspec> leaves unstaged files intact' ' test foo,bar = $(cat foo),$(cat bar) ' +test_expect_success 'stash -- <subdir> leaves untracked files in subdir intact' ' + git reset && + >subdir/untracked && + >subdir/tracked1 && + >subdir/tracked2 && + git add subdir/tracked* && + git stash -- subdir/ && + test_path_is_missing subdir/tracked1 && + test_path_is_missing subdir/tracked2 && + test_path_is_file subdir/untracked && + git stash pop && + test_path_is_file subdir/tracked1 && + test_path_is_file subdir/tracked2 && + test_path_is_file subdir/untracked +' + +test_expect_success 'stash -- <subdir> works with binary files' ' + git reset && + >subdir/untracked && + >subdir/tracked && + cp "$TEST_DIRECTORY"/test-binary-1.png subdir/tracked-binary && + git add subdir/tracked* && + git stash -- subdir/ && + test_path_is_missing subdir/tracked && + test_path_is_missing subdir/tracked-binary && + test_path_is_file subdir/untracked && + git stash pop && + test_path_is_file subdir/tracked && + test_path_is_file subdir/tracked-binary && + test_path_is_file subdir/untracked +' + test_done |