From: Tomas Carnecky <tom@dbservice.com>
Date: Tue, 28 Sep 2010 13:19:51 +0000 (+1000)
Subject: stash drops the stash even if creating the branch fails because it already exists
X-Git-Tag: v1.7.3.1~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=835d6a1f9f6f0f6e47cf32238af7ee8b8d048d78;p=git.git

stash drops the stash even if creating the branch fails because it already exists

This bug was disovered by someone on IRC when he tried to

    $ git stash branch <branch> <stash>

while <branch> already existed. In that case the stash is dropped even
though it isn't applied on any branch, so the stash is effectively lost.

Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 9ed2396e2..4215cc698 100755
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -545,4 +545,15 @@ 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' '
+	git stash clear &&
+	echo foo >file &&
+	git add file &&
+	git commit -m initial &&
+	echo bar >file &&
+	git stash &&
+	test_must_fail git stash branch master stash@{0} &&
+	git rev-parse stash@{0} --
+'
+
 test_done