Le vendredi 11 juillet 2008, Miklos Vajna a écrit :
> 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@xxxxxxxxxxxxxx>
> ---
> git-bisect.sh | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/git-bisect.sh b/git-bisect.sh
> index 991b2ef..f4852a9 100755
> --- a/git-bisect.sh
> +++ b/git-bisect.sh
> @@ -149,7 +149,7 @@ bisect_start() {
> echo "$start_head" >"$GIT_DIR/BISECT_START" &&
> sq "$@" >"$GIT_DIR/BISECT_NAMES" &&
> 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.
> #
> @@ -169,7 +169,7 @@ bisect_write() {
> esac
> git update-ref "refs/bisect/$tag" "$rev" || exit
> 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() {
> @@ -426,9 +426,9 @@ bisect_clean_state() {
> bisect_replay () {
> test -r "$1" || die "cannot read $1 for replaying"
> bisect_reset
> - while read bisect command rev
> + while read git bisect command rev
> do
> - test "$bisect" = "git-bisect" || continue
> + test "$git $bisect" = "git bisect" || continue
> case "$command" in
> start)
> cmd="bisect_start $rev"
Wouldn't it be better if bisect_replay could read old logs?
Maybe with something like:
+ while read git bisect command rev
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
start)
cmd="bisect_start $rev"
Thanks,
Christian.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
