undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eliminate confusing "won't bisect on seeked tree" failure

Browse Source 
This error message is very confusing---it doesn't tell the user
anything about how to fix the situation. And the actual fix
for the situation ("git bisect reset") does a checkout of a
potentially random branch, (compared to what the user wants to
be on for the bisect she is starting).

The simplest way to eliminate the confusion is to just make
"git bisect start" do the cleanup itself. There's no significant
loss of safety here since we already have a general safety in
the form of the reflog.

Note: We preserve the warning for any cogito users. We do this
by switching from .git/head-name to .git/BISECT_START for the
extra state, (which is a more descriptive name anyway).

Signed-off-by: Carl Worth <cworth@cworth.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Carl Worth 2008-02-23 17:14:17 -08:00 committed by Junio C Hamano
parent 923d44aeb7
commit b577bb925e
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
git-bisect.sh
View File

@ -67,16 +67,18 @@ bisect_start() {
die "Bad HEAD - I need a HEAD" die "Bad HEAD - I need a HEAD"
case "$head" in case "$head" in
refs/heads/bisect) refs/heads/bisect)
if [ -s "$GIT_DIR/head-name" ]; then if [ -s "$GIT_DIR/BISECT_START" ]; then
branch=`cat "$GIT_DIR/head-name"` branch=`cat "$GIT_DIR/BISECT_START"`
else else
branch=master branch=master
fi fi
git checkout $branch || exit git checkout $branch || exit
;; ;;
refs/heads/*|$_x40) refs/heads/*|$_x40)
# This error message should only be triggered by cogito usage,
# and cogito users should understand it relates to cg-seek.
[ -s "$GIT_DIR/head-name" ] && die "won't bisect on seeked tree" [ -s "$GIT_DIR/head-name" ] && die "won't bisect on seeked tree"
echo "${head#refs/heads/}" >"$GIT_DIR/head-name" echo "${head#refs/heads/}" >"$GIT_DIR/BISECT_START"
;; ;;
*) *)
die "Bad HEAD - strange symbolic ref" die "Bad HEAD - strange symbolic ref"
@ -353,8 +355,8 @@ bisect_reset() {
return return
} }
case "$#" in case "$#" in
0) if [ -s "$GIT_DIR/head-name" ]; then 0) if [ -s "$GIT_DIR/BISECT_START" ]; then
branch=`cat "$GIT_DIR/head-name"` branch=`cat "$GIT_DIR/BISECT_START"`
else else
branch=master branch=master
fi ;; fi ;;
@ -365,7 +367,9 @@ bisect_reset() {
usage ;; usage ;;
esac esac
if git checkout "$branch"; then if git checkout "$branch"; then
# Cleanup head-name if it got left by an old version of git-bisect
rm -f "$GIT_DIR/head-name" rm -f "$GIT_DIR/head-name"
rm -f "$GIT_DIR/BISECT_START"
bisect_clean_state bisect_clean_state
fi fi
} }

2
t/t6030-bisect-porcelain.sh
View File

@ -260,7 +260,7 @@ test_expect_success 'bisect starting with a detached HEAD' '
git checkout master^ && git checkout master^ &&
HEAD=$(git rev-parse --verify HEAD) && HEAD=$(git rev-parse --verify HEAD) &&
git bisect start && git bisect start &&
test $HEAD = $(cat .git/head-name) && test $HEAD = $(cat .git/BISECT_START) &&
git bisect reset && git bisect reset &&
test $HEAD = $(git rev-parse --verify HEAD) test $HEAD = $(git rev-parse --verify HEAD)