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>
This commit is contained in:
parent
b9c76ddd27
commit
6c98c0548a
@ -149,7 +149,7 @@ bisect_start() {
|
|||||||
echo "$start_head" >"$GIT_DIR/BISECT_START" &&
|
echo "$start_head" >"$GIT_DIR/BISECT_START" &&
|
||||||
sq "$@" >"$GIT_DIR/BISECT_NAMES" &&
|
sq "$@" >"$GIT_DIR/BISECT_NAMES" &&
|
||||||
eval "$eval" &&
|
eval "$eval" &&
|
||||||
echo "git-bisect start$orig_args" >>"$GIT_DIR/BISECT_LOG" || exit
|
echo "git bisect start$orig_args" >>"$GIT_DIR/BISECT_LOG" || exit
|
||||||
#
|
#
|
||||||
# Check if we can proceed to the next bisect state.
|
# Check if we can proceed to the next bisect state.
|
||||||
#
|
#
|
||||||
@ -169,7 +169,7 @@ bisect_write() {
|
|||||||
esac
|
esac
|
||||||
git update-ref "refs/bisect/$tag" "$rev" || exit
|
git update-ref "refs/bisect/$tag" "$rev" || exit
|
||||||
echo "# $state: $(git show-branch $rev)" >>"$GIT_DIR/BISECT_LOG"
|
echo "# $state: $(git show-branch $rev)" >>"$GIT_DIR/BISECT_LOG"
|
||||||
test -n "$nolog" || echo "git-bisect $state $rev" >>"$GIT_DIR/BISECT_LOG"
|
test -n "$nolog" || echo "git bisect $state $rev" >>"$GIT_DIR/BISECT_LOG"
|
||||||
}
|
}
|
||||||
|
|
||||||
bisect_state() {
|
bisect_state() {
|
||||||
@ -426,9 +426,13 @@ bisect_clean_state() {
|
|||||||
bisect_replay () {
|
bisect_replay () {
|
||||||
test -r "$1" || die "cannot read $1 for replaying"
|
test -r "$1" || die "cannot read $1 for replaying"
|
||||||
bisect_reset
|
bisect_reset
|
||||||
while read bisect command rev
|
while read git bisect command rev
|
||||||
do
|
do
|
||||||
test "$bisect" = "git-bisect" || continue
|
test "$git $bisect" = "git bisect" -o "$git" = "git-bisect" || continue
|
||||||
|
if test "$git" = "git-bisect"; then
|
||||||
|
rev="$command"
|
||||||
|
command="$bisect"
|
||||||
|
fi
|
||||||
case "$command" in
|
case "$command" in
|
||||||
start)
|
start)
|
||||||
cmd="bisect_start $rev"
|
cmd="bisect_start $rev"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user