[PATCH] Avoid warning when bisecting a merge
- From
Gustaf Hendeby <hendeby@isy.liu.se>
- Date
- Sep 4, 2008, 21:02 UTC
- Message-ID
- <1220562150-19962-1-git-send-email-hendeby@isy.liu.se>
Trying to compare an empty string as a number results in an error, hence make sure checkout_done is set before using it.
Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se> ---
This one should go on top of cc/bisect.
/Gustaf
git-bisect.sh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/git-bisect.sh b/git-bisect.sh index 69a9a56..05d14b3 100755 --- a/git-bisect.sh +++ b/git-bisect.sh @@ -437,6 +437,7 @@ bisect_next() { "refs/bisect/skip-*" | tr '\012' ' ') && # Maybe some merge bases must be tested first + checkout_done=0 check_good_are_ancestors_of_bad "$bad" "$good" "$skip" || exit test "$checkout_done" -eq "1" && checkout_done='' && return
-- 1.6.0.1.320.ga0f13.dirty