summaryrefslogtreecommitdiff
path: root/git-bisect.sh
diff options
context:
space:
mode:
authorSZEDER Gábor <szeder@ira.uka.de>2010-10-10 23:48:56 +0200
committerJunio C Hamano <gitster@pobox.com>2010-10-13 15:07:50 -0700
commit412ff738addd3f329d641073fd1aa32629d5bfbf (patch)
tree8324b2697705014fa06a91e5beee7638b4baa0b0 /git-bisect.sh
parentc752e7f3e8d96a9673ad248addc9418164bd3ce6 (diff)
downloadgit-412ff738addd3f329d641073fd1aa32629d5bfbf.tar.gz
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>
Diffstat (limited to 'git-bisect.sh')
-rwxr-xr-xgit-bisect.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/git-bisect.sh b/git-bisect.sh
index 6e2acb8ef2..3a4bf8150d 100755
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -412,6 +412,10 @@ bisect_run () {
done
}
+bisect_log () {
+ test -s "$GIT_DIR/BISECT_LOG" || die "We are not bisecting."
+ cat "$GIT_DIR/BISECT_LOG"
+}
case "$#" in
0)
@@ -438,7 +442,7 @@ case "$#" in
replay)
bisect_replay "$@" ;;
log)
- cat "$GIT_DIR/BISECT_LOG" ;;
+ bisect_log ;;
run)
bisect_run "$@" ;;
*)