status, branch: fix the misleading "bisecting" message

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/branch.c b/builtin/branch.c
index 99105f8b1f87f27b244331ee854c458cc5a9e9be..8f00203d76c663818297d2d47be548a71b0a2b6c 100644 (file)
--- 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, 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)"),
                            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 9b6f0d06700ee3c8c9126060208679fcb44f38f4..2fce99a0754481a36b3644d01f8577310e19d763 100755 (executable)
--- 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 &&
        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' '
        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 5adba4f5e4f2476a60bfe41c0246f7a5a72127b6..c35d01de54122de549ea7ec4f4ab66309ec6fe36 100755 (executable)
--- 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
        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)
        #   (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 32a51e1323e28a49f617be4b53e35416f52cb066..cf3d81ab29b0316a1c606006019ae19013d03d48 100644 (file)
--- 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,
 {
        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,
                                 state->branch);
        else
                status_printf_ln(s, color,