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>
Nguyễn Thái Ngọc Duy committed
Mar 23, 2013 at 10:52 UTC
6deab24d8832e3cb2f554b827af521b094a2b32d
4 files changed
+4
-4
builtin/branch.c
+1
-1
@@ -562,7 +562,7 @@ static char *get_head_description(void)
562
strbuf_addf(&desc, _("(no branch, rebasing %s)"),
563
state.branch);
564
else if (state.bisect_in_progress)
565
- strbuf_addf(&desc, _("(no branch, bisecting %s)"),
565
+ strbuf_addf(&desc, _("(no branch, bisect started on %s)"),
566
state.branch);
567
else if (state.detached_from)
568
strbuf_addf(&desc, _("(detached from %s)"),
t/t6030-bisect-porcelain.sh
+1
-1
@@ -164,7 +164,7 @@ test_expect_success 'bisect start: existing ".git/BISECT_START" not modified if
164
cp .git/BISECT_START saved &&
165
test_must_fail git bisect start $HASH4 foo -- &&
166
git branch > branch.output &&
167
- test_i18ngrep "* (no branch, bisecting other)" branch.output > /dev/null &&
167
+ test_i18ngrep "* (no branch, bisect started on other)" branch.output > /dev/null &&
168
test_cmp saved .git/BISECT_START
169
'
170
test_expect_success 'bisect start: no ".git/BISECT_START" if mistaken rev' '
t/t7512-status-help.sh
+1
-1
@@ -578,7 +578,7 @@ test_expect_success 'status when bisecting' '
578
TGT=$(git rev-parse --short two_bisect) &&
579
cat >expected <<-EOF &&
580
# HEAD detached at $TGT
581
- # You are currently bisecting branch '\''bisect'\''.
581
+ # You are currently bisecting, started from branch '\''bisect'\''.
582
# (use "git bisect reset" to get back to the original branch)
583
#
584
nothing to commit (use -u to show untracked files)
wt-status.c
+1
-1
@@ -953,7 +953,7 @@ static void show_bisect_in_progress(struct wt_status *s,
953
{
954
if (state->branch)
955
status_printf_ln(s, color,
956
- _("You are currently bisecting branch '%s'."),
956
+ _("You are currently bisecting, started from branch '%s'."),
957
state->branch);
958
else
959
status_printf_ln(s, color,