bisect: improve error msg of 'bisect reset' when original HEAD is deleted
'git bisect reset' (without the optional <commit> argument) returns to the original HEAD from where the bisection was started. However, when, for whatever reason, the user deleted the original HEAD before invoking 'git bisect reset', then all he gets is an error message from 'git checkout': fatal: invalid reference: somebranch Let's try to be more helpful with an error message better describing what went wrong and a suggestion about how to resolve the situation: Could not check out original HEAD 'somebranch'. Try 'git bisect reset <commit>'. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
SZEDER Gábor committed
Oct 10, 2010 at 23:48 UTC
3bb8cf88247db589b60e79c0520b081793cfd68e
1 file changed
+6
-1
git-bisect.sh
+6
-1
@@ -316,7 +316,12 @@ bisect_reset() {
316
*)
317
usage ;;
318
esac
319
- git checkout "$branch" -- && bisect_clean_state
319
+ if git checkout "$branch" -- ; then
320
+ bisect_clean_state
321
+ else
322
+ die "Could not check out original HEAD '$branch'." \
323
+ "Try 'git bisect reset <commit>'."
324
+ fi
325
}
326
327
bisect_clean_state() {