Skip to content

Commit

Permalink
bisect: improve error message when branch checkout fails
Browse files Browse the repository at this point in the history
In "git-bisect.sh" the "git checkout" command is only used to
change the current branch, but it is used like this:

git checkout "$branch"

which will output the following misleading error message when
it fails:

error: pathspec 'foo' did not match any file(s) known to git.

This patch change the way we use "git checkout" like this:

git checkout "$branch" --

so that we will get the following error message:

fatal: invalid reference: foo

which is better.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Christian Couder authored and Junio C Hamano committed Apr 5, 2009
1 parent 0da43a6 commit f3a186f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions git-bisect.sh
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ bisect_start() {
then
# Reset to the rev from where we started.
start_head=$(cat "$GIT_DIR/BISECT_START")
git checkout "$start_head" || exit
git checkout "$start_head" -- || exit
else
# Get rev from where we start.
case "$head" in
Expand Down Expand Up @@ -370,7 +370,7 @@ bisect_checkout() {
_msg="$2"
echo "Bisecting: $_msg"
mark_expected_rev "$_rev"
git checkout -q "$_rev" || exit
git checkout -q "$_rev" -- || exit
git show-branch "$_rev"
}

Expand Down Expand Up @@ -549,7 +549,7 @@ bisect_reset() {
*)
usage ;;
esac
git checkout "$branch" && bisect_clean_state
git checkout "$branch" -- && bisect_clean_state
}

bisect_clean_state() {
Expand Down

0 comments on commit f3a186f

Please sign in to comment.