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

bisect: improve error message when branch checkout fails

Browse Source 
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>
This commit is contained in:
Christian Couder 2009-04-04 22:02:26 +02:00 committed by Junio C Hamano
parent 0da43a685a
commit f3a186ffad
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git-bisect.sh
View File

@ -77,7 +77,7 @@ bisect_start() {
then then
# Reset to the rev from where we started. # Reset to the rev from where we started.
start_head=$(cat "$GIT_DIR/BISECT_START") start_head=$(cat "$GIT_DIR/BISECT_START")
git checkout "$start_head" || exit git checkout "$start_head" -- || exit
else else
# Get rev from where we start. # Get rev from where we start.
case "$head" in case "$head" in
@ -370,7 +370,7 @@ bisect_checkout() {
_msg="$2" _msg="$2"
echo "Bisecting: $_msg" echo "Bisecting: $_msg"
mark_expected_rev "$_rev" mark_expected_rev "$_rev"
git checkout -q "$_rev" || exit git checkout -q "$_rev" -- || exit
git show-branch "$_rev" git show-branch "$_rev"
} }
@ -549,7 +549,7 @@ bisect_reset() {
*) *)
usage ;; usage ;;
esac esac
git checkout "$branch" && bisect_clean_state git checkout "$branch" -- && bisect_clean_state
} }
bisect_clean_state() { bisect_clean_state() {