mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-20 11:24:02 +01:00
Code

git-bisect: modernize branch shuffling hack

Browse Source 
When switching to a new rev, we first made "new-bisect" branch to
point at the chosen commit, attempt to switch to it, and then
finally renamed the new-bisect branch to bisect by hand when
successful.  This is so that we can catch checkout failure (your
local modification may interfere with switching to the chosen
version) without losing information on which commit the next
attempt should be made.

Rewrite it using a more modern form but without breaking the
safety.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2007-11-15 00:47:53 -08:00
parent 3d7cd64cb4
commit 0bee49c6ab
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
git-bisect.sh
View File

@ -316,10 +316,9 @@ bisect_next() {
exit_if_skipped_commits "$bisect_rev"
echo "Bisecting: $bisect_nr revisions left to test after this"
echo "$bisect_rev" >"$GIT_DIR/refs/heads/new-bisect"
git branch -f new-bisect "$bisect_rev"
git checkout -q new-bisect || exit
mv "$GIT_DIR/refs/heads/new-bisect" "$GIT_DIR/refs/heads/bisect" &&
GIT_DIR="$GIT_DIR" git symbolic-ref HEAD refs/heads/bisect
git branch -M new-bisect bisect
git show-branch "$bisect_rev"
}