author | Gerrit Pape <pape@smarden.org> | |
Mon, 5 May 2008 07:43:00 +0000 (07:43 +0000) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 6 May 2008 00:18:20 +0000 (17:18 -0700) | ||
commit | ee831f7ddfc40e9144208c93e24d20ff0ad69194 | |
tree | be7a81b489709ead6ebbbb6a0c662dca1f1add84 | tree | snapshot |
parent | 6233a5210ef64ba31bbf0e867e03e9176e0aace9 | commit | diff |
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>
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>
Documentation/git-bisect.txt | diff | blob | history | |
git-bisect.sh | diff | blob | history | |
t/t6030-bisect-porcelain.sh | diff | blob | history |