undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bisect: improve error message of 'bisect log' while not bisecting

Browse Source 
'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>
This commit is contained in:
SZEDER Gábor 2010-10-10 23:48:56 +02:00 committed by Junio C Hamano
parent c752e7f3e8
commit 412ff738ad
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git-bisect.sh
View File

@ -412,6 +412,10 @@ bisect_run () {
done done
} }
bisect_log () {
test -s "$GIT_DIR/BISECT_LOG" || die "We are not bisecting."
cat "$GIT_DIR/BISECT_LOG"
}
case "$#" in case "$#" in
0) 0)
@ -438,7 +442,7 @@ case "$#" in
replay) replay)
bisect_replay "$@" ;; bisect_replay "$@" ;;
log) log)
cat "$GIT_DIR/BISECT_LOG" ;; bisect_log ;;
run) run)
bisect_run "$@" ;; bisect_run "$@" ;;
*) *)