diff options
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3903-stash.sh | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index 376cc8f4ab..38906785e2 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -1384,6 +1384,21 @@ test_expect_success 'stash --keep-index with file deleted in index does not resu test_path_is_missing to-remove ' +test_expect_success 'stash --keep-index --include-untracked with empty tree' ' + test_when_finished "rm -rf empty" && + git init empty && + ( + cd empty && + git commit --allow-empty --message "empty" && + echo content >file && + git stash push --keep-index --include-untracked && + test_path_is_missing file && + git stash pop && + echo content >expect && + test_cmp expect file + ) +' + test_expect_success 'stash apply should succeed with unmodified file' ' echo base >file && git add file && |