diff options
| author | Gerrit Pape <pape@smarden.org> | 2008-05-05 07:43:00 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-05 17:18:20 -0700 |
| commit | ee831f7ddfc40e9144208c93e24d20ff0ad69194 (patch) | |
| tree | be7a81b489709ead6ebbbb6a0c662dca1f1add84 /t | |
| parent | 6233a5210ef64ba31bbf0e867e03e9176e0aace9 (diff) | |
| download | git-ee831f7ddfc40e9144208c93e24d20ff0ad69194.tar.gz | |
git-bisect.sh: don't accidentally override existing branch "bisect"
If a branch named "bisect" or "new-bisect" already was created in the
repo by other means than git bisect, doing a git bisect used to override
the branch without a warning. Now if the branch "bisect" or
"new-bisect" already exists, and it was not created by git bisect itself,
git bisect start fails with an appropriate error message. Additionally,
if checking out a new bisect state fails due to a merge problem, git
bisect cleans up the temporary branch "new-bisect".
The accidental override has been noticed by Andres Salomon, reported
through
http://bugs.debian.org/478647
Signed-off-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6030-bisect-porcelain.sh | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index 5e3e5445c7..05f1e15c34 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -284,6 +284,24 @@ test_expect_success 'bisect starting with a detached HEAD' ' ' +test_expect_success 'bisect refuses to start if branch bisect exists' ' + git bisect reset && + git branch bisect && + test_must_fail git bisect start && + git branch -d bisect && + git checkout -b bisect && + test_must_fail git bisect start && + git checkout master && + git branch -d bisect +' + +test_expect_success 'bisect refuses to start if branch new-bisect exists' ' + git bisect reset && + git branch new-bisect && + test_must_fail git bisect start && + git branch -d new-bisect +' + # # test_done |