Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

git-bisect: use dash-less form on git bisect log

Given that users are supposed to type 'git bisect' now, make the output
of 'git bisect log' consistent with this.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information...
commit 6c98c0548aa3433ba64708ca8f08d44cd923f0b7 1 parent b9c76dd
Miklos Vajna authored gitster committed

Showing 1 changed file with 8 additions and 4 deletions. Show diff stats Hide diff stats

  1. 12  git-bisect.sh
12  git-bisect.sh
@@ -149,7 +149,7 @@ bisect_start() {
149 149
 	echo "$start_head" >"$GIT_DIR/BISECT_START" &&
150 150
 	sq "$@" >"$GIT_DIR/BISECT_NAMES" &&
151 151
 	eval "$eval" &&
152  
-	echo "git-bisect start$orig_args" >>"$GIT_DIR/BISECT_LOG" || exit
  152
+	echo "git bisect start$orig_args" >>"$GIT_DIR/BISECT_LOG" || exit
153 153
 	#
154 154
 	# Check if we can proceed to the next bisect state.
155 155
 	#
@@ -169,7 +169,7 @@ bisect_write() {
169 169
 	esac
170 170
 	git update-ref "refs/bisect/$tag" "$rev" || exit
171 171
 	echo "# $state: $(git show-branch $rev)" >>"$GIT_DIR/BISECT_LOG"
172  
-	test -n "$nolog" || echo "git-bisect $state $rev" >>"$GIT_DIR/BISECT_LOG"
  172
+	test -n "$nolog" || echo "git bisect $state $rev" >>"$GIT_DIR/BISECT_LOG"
173 173
 }
174 174
 
175 175
 bisect_state() {
@@ -426,9 +426,13 @@ bisect_clean_state() {
426 426
 bisect_replay () {
427 427
 	test -r "$1" || die "cannot read $1 for replaying"
428 428
 	bisect_reset
429  
-	while read bisect command rev
  429
+	while read git bisect command rev
430 430
 	do
431  
-		test "$bisect" = "git-bisect" || continue
  431
+		test "$git $bisect" = "git bisect" -o "$git" = "git-bisect" || continue
  432
+		if test "$git" = "git-bisect"; then
  433
+			rev="$command"
  434
+			command="$bisect"
  435
+		fi
432 436
 		case "$command" in
433 437
 		start)
434 438
 			cmd="bisect_start $rev"

0 notes on commit 6c98c05

Please sign in to comment.
Something went wrong with that request. Please try again.