diff options
| author | Tomas Carnecky <tom@dbservice.com> | 2010-09-28 17:19:51 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-29 20:59:42 +0400 |
| commit | 835d6a1f9f6f0f6e47cf32238af7ee8b8d048d78 (patch) | |
| tree | dd3d741a4bc4cceff0ed0ef9aa15b18ad2bd383c | |
| parent | 442cb08fa0dca38c99cf1ff8a5654a95a5cad7a4 (diff) | |
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>
| -rwxr-xr-x | t/t3903-stash.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index 9ed2396e29..4215cc6986 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 |