diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-01-13 11:33:36 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-01-13 11:33:37 -0800 |
commit | ff724276cd880982742c7f89efc375432055f92b (patch) | |
tree | 8ea3b0c3de80299058d0d6829b348b966c0c9cbe /t | |
parent | Merge branch 'jn/pager-lv-default-env' (diff) | |
parent | stash: handle specifying stashes with $IFS (diff) | |
download | tgif-ff724276cd880982742c7f89efc375432055f92b.tar.xz |
Merge branch 'ow/stash-with-ifs'
The implementation of 'git stash $cmd "stash@{...}"' did not quote
the stash argument properly and left it split at IFS whitespace.
* ow/stash-with-ifs:
stash: handle specifying stashes with $IFS
Diffstat (limited to 't')
-rwxr-xr-x | t/t3903-stash.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index debda7a678..5b79b216e2 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -673,4 +673,16 @@ test_expect_success 'store updates stash ref and reflog' ' grep quux bazzy ' +test_expect_success 'handle stash specification with spaces' ' + git stash clear && + echo pig >file && + git stash && + stamp=$(git log -g --format="%cd" -1 refs/stash) && + test_tick && + echo cow >file && + git stash && + git stash apply "stash@{$stamp}" && + grep pig file +' + test_done |