undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stash: fix git stash branch regression when branch creation fails

Browse Source 
"git stash branch <branch> <stash>" started discarding the stash
when the branch creation fails.  It should have kept the stash
intact when aborting.

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jon Seymour 2010-09-28 23:19:52 +10:00 committed by Junio C Hamano
parent 835d6a1f9f
commit 57693d03db
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git-stash.sh
View File

@ -446,9 +446,9 @@ apply_to_branch () {
assert_stash_like "$@"
git checkout -b $branch $REV^ &&
apply_stash "$@"
test -z "$IS_STASH_REF" || drop_stash "$@"
apply_stash "$@" && {
test -z "$IS_STASH_REF" || drop_stash "$@"
}
}
PARSE_CACHE='--not-parsed'

2
t/t3903-stash.sh
View File

@ -545,7 +545,7 @@ test_expect_success 'invalid ref of the form stash@{n}, n >= N' '
git stash drop
'
test_expect_failure 'stash branch should not drop the stash if the branch exists' '
test_expect_success 'stash branch should not drop the stash if the branch exists' '
git stash clear &&
echo foo >file &&
git add file &&