diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2013-03-23 10:52:44 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-23 22:29:15 -0700 |
| commit | 6deab24d8832e3cb2f554b827af521b094a2b32d (patch) | |
| tree | 2c43d7ee4bfd9469c470dd4f1a9707f56f7a4f99 | |
| parent | c8183cd2851965665655738fc399c44f546d5b79 (diff) | |
| download | git-6deab24d8832e3cb2f554b827af521b094a2b32d.tar.gz git-6deab24d8832e3cb2f554b827af521b094a2b32d.tar.xz | |
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>
| -rw-r--r-- | builtin/branch.c | 2 | ||||
| -rwxr-xr-x | t/t6030-bisect-porcelain.sh | 2 | ||||
| -rwxr-xr-x | t/t7512-status-help.sh | 2 | ||||
| -rw-r--r-- | wt-status.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index 99105f8b1..8f00203d7 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 9b6f0d067..2fce99a07 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 5adba4f5e..c35d01de5 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 32a51e132..cf3d81ab2 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, |