From ee831f7ddfc40e9144208c93e24d20ff0ad69194 Mon Sep 17 00:00:00 2001 From: Gerrit Pape Date: Mon, 5 May 2008 07:43:00 +0000 Subject: 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 Signed-off-by: Junio C Hamano --- Documentation/git-bisect.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation') 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). -- cgit v1.2.3