bisect: improve error message of 'bisect log' while not bisecting
'git bisect log' is implemented by a direct invocation of 'cat "$GIT_DIR/BISECT_LOG"', without any sanity checks. Consequently, running 'git bisect log' while not bisecting leads to an error, because the bisect logfile doesn't exists. The accompanying error message cat: /path/to/repo/.git/BISECT_LOG: No such file or directory is neither very helpful nor very friendly. Instead of blindly trying to cat the log file, first check whether there is a bisection going on (i.e. the bisect logfile exists), and die with a more appropriate error message when not. 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
412ff738addd3f329d641073fd1aa32629d5bfbf
1 file changed
+5
-1
git-bisect.sh
+5
-1
@@ -412,6 +412,10 @@ bisect_run () {
412
done
413
}
414
415
+bisect_log () {
416
+ test -s "$GIT_DIR/BISECT_LOG" || die "We are not bisecting."
417
+ cat "$GIT_DIR/BISECT_LOG"
418
+}
419
420
case "$#" in
421
0)
@@ -438,7 +442,7 @@ case "$#" in
442
replay)
443
bisect_replay "$@" ;;
444
log)
441
- cat "$GIT_DIR/BISECT_LOG" ;;
445
+ bisect_log ;;
446
run)
447
bisect_run "$@" ;;
448
*)