summaryrefslogtreecommitdiff
path: root/git-stash.sh
diff options
context:
space:
mode:
authorJon Seymour <jon.seymour@gmail.com>2010-09-28 23:19:52 +1000
committerJunio C Hamano <gitster@pobox.com>2010-09-29 10:07:09 -0700
commit57693d03db93959831c9c017953f979aae6cc8eb (patch)
tree4caeb362b25864e84d90cea84028ecf743cb6974 /git-stash.sh
parent835d6a1f9f6f0f6e47cf32238af7ee8b8d048d78 (diff)
downloadgit-57693d03db93959831c9c017953f979aae6cc8eb.tar.gz
stash: fix git stash branch regression when branch creation fails
"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>
Diffstat (limited to 'git-stash.sh')
-rwxr-xr-xgit-stash.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-stash.sh b/git-stash.sh
index 57f36ce8dd..02113263e3 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -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'