mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
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>
This commit is contained in:
parent
412ff738ad
commit
3bb8cf8824
|
@ -316,7 +316,12 @@ bisect_reset() {
|
|||
*)
|
||||
usage ;;
|
||||
esac
|
||||
git checkout "$branch" -- && bisect_clean_state
|
||||
if git checkout "$branch" -- ; then
|
||||
bisect_clean_state
|
||||
else
|
||||
die "Could not check out original HEAD '$branch'." \
|
||||
"Try 'git bisect reset <commit>'."
|
||||
fi
|
||||
}
|
||||
|
||||
bisect_clean_state() {
|
||||
|
|
Loading…
Reference in a new issue