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 /Documentation | |
| parent | Merge branch 'maint-1.5.4' into maint (diff) | |
| download | tgif-ee831f7ddfc40e9144208c93e24d20ff0ad69194.tar.xz | |
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 'Documentation')
| -rw-r--r-- | Documentation/git-bisect.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt index 96585ae8d9..0855b98b28 100644 --- a/Documentation/git-bisect.txt +++ b/Documentation/git-bisect.txt @@ -78,7 +78,7 @@ Oh, and then after you want to reset to the original head, do a $ git bisect reset ------------------------------------------------ -to get back to the master branch, instead of being in one of the +to get back to the original branch, instead of being in one of the bisection branches ("git bisect start" will do that for you too, actually: it will reset the bisection state, and before it does that it checks that you're not using some old bisection branch). |