mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/maint-stash-oob'

Browse Source 
* jk/maint-stash-oob:
  stash: fix false positive in the invalid ref test.
  stash: fix accidental apply of non-existent stashes

Conflicts:
	t/t3903-stash.sh
This commit is contained in:
Junio C Hamano
2011-04-27 11:36:42 -07:00
parent 29dba37f1f 9355fc9c35
commit fcbf164fcb
2 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
t/t3903-stash.sh
View File

@ -37,6 +37,12 @@ test_expect_success 'parents of stash' '
test_cmp output expect
'
test_expect_success 'applying bogus stash does nothing' '
test_must_fail git stash apply stash@{1} &&
echo 1 >expect &&
test_cmp expect file
'
test_expect_success 'apply does not need clean working directory' '
echo 4 >other-file &&
git add other-file &&
@ -549,11 +555,11 @@ test_expect_success 'invalid ref of the form stash@{n}, n >= N' '
echo bar6 > file2 &&
git add file2 &&
git stash &&
test_must_fail git drop stash@{1} &&
test_must_fail git pop stash@{1} &&
test_must_fail git apply stash@{1} &&
test_must_fail git show stash@{1} &&
test_must_fail git branch tmp stash@{1} &&
test_must_fail git stash drop stash@{1} &&
test_must_fail git stash pop stash@{1} &&
test_must_fail git stash apply stash@{1} &&
test_must_fail git stash show stash@{1} &&
test_must_fail git stash branch tmp stash@{1} &&
git stash drop
'