diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-02-05 14:03:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-05 14:03:20 -0800 |
| commit | a74a682b55848007909fb210de45aa7b8260a49a (patch) | |
| tree | af3bebd98b6ff06c6e94a32b2a1e719b87beb148 /t | |
| parent | 3c864743a68a81b5a15bbd92afcea74470c1bc2f (diff) | |
| parent | 2a07e4374c0ba6f2e991965c99b448ccb563f2fc (diff) | |
| download | git-a74a682b55848007909fb210de45aa7b8260a49a.tar.gz | |
Merge branch 'ow/stash-with-ifs' into maint
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 |