diff options
| author | Thomas Gummerer <t.gummerer@gmail.com> | 2017-02-28 20:33:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-28 22:21:05 (GMT) |
| commit | df6bba0937209d679a06addd26975593fef744f2 (patch) | |
| tree | a4f22b7e2d13ff8fadc931d4002136259b9a0f38 /t/t3905-stash-include-untracked.sh | |
| parent | 9ca6326dff29b97cfb126e6460105920c492fa15 (diff) | |
| download | git-df6bba0937209d679a06addd26975593fef744f2.zip git-df6bba0937209d679a06addd26975593fef744f2.tar.gz git-df6bba0937209d679a06addd26975593fef744f2.tar.bz2 | |
stash: teach 'push' (and 'create_stash') to honor pathspec
While working on a repository, it's often helpful to stash the changes
of a single or multiple files, and leave others alone. Unfortunately
git currently offers no such option. git stash -p can be used to work
around this, but it's often impractical when there are a lot of changes
over multiple files.
Allow 'git stash push' to take pathspec to specify which paths to stash.
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3905-stash-include-untracked.sh')
| -rwxr-xr-x | t/t3905-stash-include-untracked.sh | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/t/t3905-stash-include-untracked.sh b/t/t3905-stash-include-untracked.sh index f372fc8..193adc7 100755 --- a/t/t3905-stash-include-untracked.sh +++ b/t/t3905-stash-include-untracked.sh @@ -185,4 +185,30 @@ test_expect_success 'stash save --all is stash poppable' ' test -s .gitignore ' +test_expect_success 'stash push --include-untracked with pathspec' ' + >foo && + >bar && + git stash push --include-untracked -- foo && + test_path_is_file bar && + test_path_is_missing foo && + git stash pop && + test_path_is_file bar && + test_path_is_file foo +' + +test_expect_success 'stash push with $IFS character' ' + >"foo bar" && + >foo && + >bar && + git add foo* && + git stash push --include-untracked -- "foo b*" && + test_path_is_missing "foo bar" && + test_path_is_file foo && + test_path_is_file bar && + git stash pop && + test_path_is_file "foo bar" && + test_path_is_file foo && + test_path_is_file bar +' + test_done |