mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

status, branch: fix the misleading "bisecting" message

Browse Source 
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>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2013-03-23 10:52:44 +07:00
committed by Junio C Hamano
parent c8183cd285
commit 6deab24d88
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/branch.c
View File

@ -562,7 +562,7 @@ static char *get_head_description(void)
strbuf_addf(&desc, _("(no branch, rebasing %s)"), strbuf_addf(&desc, _("(no branch, rebasing %s)"),
state.branch); state.branch);
else if (state.bisect_in_progress) else if (state.bisect_in_progress)
strbuf_addf(&desc, _("(no branch, bisecting %s)"), strbuf_addf(&desc, _("(no branch, bisect started on %s)"),
state.branch); state.branch);
else if (state.detached_from) else if (state.detached_from)
strbuf_addf(&desc, _("(detached from %s)"), strbuf_addf(&desc, _("(detached from %s)"),

2
t/t6030-bisect-porcelain.sh
View File

@ -164,7 +164,7 @@ test_expect_success 'bisect start: existing ".git/BISECT_START" not modified if
cp .git/BISECT_START saved && cp .git/BISECT_START saved &&
test_must_fail git bisect start $HASH4 foo -- && test_must_fail git bisect start $HASH4 foo -- &&
git branch > branch.output && 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_cmp saved .git/BISECT_START
' '
test_expect_success 'bisect start: no ".git/BISECT_START" if mistaken rev' ' test_expect_success 'bisect start: no ".git/BISECT_START" if mistaken rev' '

2
t/t7512-status-help.sh
View File

@ -578,7 +578,7 @@ test_expect_success 'status when bisecting' '
TGT=$(git rev-parse --short two_bisect) && TGT=$(git rev-parse --short two_bisect) &&
cat >expected <<-EOF && cat >expected <<-EOF &&
# HEAD detached at $TGT # 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) # (use "git bisect reset" to get back to the original branch)
# #
nothing to commit (use -u to show untracked files) nothing to commit (use -u to show untracked files)

2
wt-status.c
View File

@ -953,7 +953,7 @@ static void show_bisect_in_progress(struct wt_status *s,
{ {
if (state->branch) if (state->branch)
status_printf_ln(s, color, status_printf_ln(s, color,
_("You are currently bisecting branch '%s'."), _("You are currently bisecting, started from branch '%s'."),
state->branch); state->branch);
else else
status_printf_ln(s, color, status_printf_ln(s, color,