diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-15 15:20:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-15 15:20:28 -0700 |
| commit | 367ea191e659da05a2e79a7025d8628a02f8268a (patch) | |
| tree | 0273a3decb6efe958e9c665208f1f2236d0cc8c4 /t | |
| parent | dda1f2a5c3aca5072aada32eef159067ba16f0e9 (diff) | |
| parent | ea41cfc4f54f884582dbda307287f12bb1fc15e9 (diff) | |
| download | git-367ea191e659da05a2e79a7025d8628a02f8268a.tar.gz git-367ea191e659da05a2e79a7025d8628a02f8268a.tar.xz | |
Merge branch 'js/stash-dwim' into tr/reset-checkout-patch
* commit 'tr/reset-checkout-patch^^2':
Make 'git stash -k' a short form for 'git stash save --keep-index'
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3903-stash.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index 7a3fb6795..e16ad93d2 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -200,4 +200,12 @@ test_expect_success 'drop -q is quiet' ' test ! -s output.out ' +test_expect_success 'stash -k' ' + echo bar3 > file && + echo bar4 > file2 && + git add file2 && + git stash -k && + test bar,bar4 = $(cat file),$(cat file2) +' + test_done |