Re: [PATCH] status, branch: fix the misleading "bisecting" message

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 24, 2013, 05:30 UTC
Message-ID: <7v4ng14b61.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1364010764-972-1-git-send-email-pclouds@gmail.com>

Nguyễn Thái Ngọc Duy <pclouds@gmail.com> writes:

Show 6 quoted lines

> The current message is "bisecting %s" (or "bisecting branch %s").
> "%s" is the current branch when we started bisecting. Clarify that to
> avoid confusion with good and bad refs passed to "bisect" command.
>
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
> ---

Sounds sensible. Is this something we should squash in to nd/branch-show-rebase-bisect-state topic, or just apply it to the top (the latter is easier for me, but you may want to keep the history free of "oops, that was a bad idea" changes).

Will queue on top, at least for now, as the topic is not in 'next'.

Thanks.

Show 58 quoted lines

>  builtin/branch.c            | 2 +-
>  t/t6030-bisect-porcelain.sh | 2 +-
>  t/t7512-status-help.sh      | 2 +-
>  wt-status.c                 | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/builtin/branch.c b/builtin/branch.c
> index 99105f8..8f00203 100644
> --- a/builtin/branch.c
> +++ b/builtin/branch.c
> @@ -562,7 +562,7 @@ static char *get_head_description(void)
>  		strbuf_addf(&desc, _("(no branch, rebasing %s)"),
>  			    state.branch);
>  	else if (state.bisect_in_progress)
> -		strbuf_addf(&desc, _("(no branch, bisecting %s)"),
> +		strbuf_addf(&desc, _("(no branch, bisect started on %s)"),
>  			    state.branch);
>  	else if (state.detached_from)
>  		strbuf_addf(&desc, _("(detached from %s)"),
> diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
> index 9b6f0d0..2fce99a 100755
> --- a/t/t6030-bisect-porcelain.sh
> +++ b/t/t6030-bisect-porcelain.sh
> @@ -164,7 +164,7 @@ test_expect_success 'bisect start: existing ".git/BISECT_START" not modified if
>  	cp .git/BISECT_START saved &&
>  	test_must_fail git bisect start $HASH4 foo -- &&
>  	git branch > branch.output &&
> -	test_i18ngrep "* (no branch, bisecting other)" branch.output > /dev/null &&
> +	test_i18ngrep "* (no branch, bisect started on other)" branch.output > /dev/null &&
>  	test_cmp saved .git/BISECT_START
>  '
>  test_expect_success 'bisect start: no ".git/BISECT_START" if mistaken rev' '
> diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh
> index 5adba4f..c35d01d 100755
> --- a/t/t7512-status-help.sh
> +++ b/t/t7512-status-help.sh
> @@ -578,7 +578,7 @@ test_expect_success 'status when bisecting' '
>  	TGT=$(git rev-parse --short two_bisect) &&
>  	cat >expected <<-EOF &&
>  	# HEAD detached at $TGT
> -	# You are currently bisecting branch '\''bisect'\''.
> +	# You are currently bisecting, started from branch '\''bisect'\''.
>  	#   (use "git bisect reset" to get back to the original branch)
>  	#
>  	nothing to commit (use -u to show untracked files)
> diff --git a/wt-status.c b/wt-status.c
> index 32a51e1..cf3d81a 100644
> --- a/wt-status.c
> +++ b/wt-status.c
> @@ -953,7 +953,7 @@ static void show_bisect_in_progress(struct wt_status *s,
>  {
>  	if (state->branch)
>  		status_printf_ln(s, color,
> -				 _("You are currently bisecting branch '%s'."),
> +				 _("You are currently bisecting, started from branch '%s'."),
>  				 state->branch);
>  	else
>  		status_printf_ln(s, color,