summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-01-13 19:33:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-01-13 19:33:37 (GMT)
commitff724276cd880982742c7f89efc375432055f92b (patch)
tree8ea3b0c3de80299058d0d6829b348b966c0c9cbe /t
parent9fac0777e16b6e342f7c84fb7059d6fca52505d2 (diff)
parent2a07e4374c0ba6f2e991965c99b448ccb563f2fc (diff)
downloadgit-ff724276cd880982742c7f89efc375432055f92b.zip
git-ff724276cd880982742c7f89efc375432055f92b.tar.gz
git-ff724276cd880982742c7f89efc375432055f92b.tar.bz2
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-xt/t3903-stash.sh12
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index debda7a..5b79b21 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