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

status: fix null termination with "-b"

Browse Source 
When the "-z" option is given to status, we are supposed to
NUL-terminate each record. However, the "-b" code to show
the tracking branch did not respect this, and always ended
with a newline.

Signed-off-by: Jeff King <peff@peff.net>
This commit is contained in:
Jeff King
2012-05-07 17:02:18 -04:00
parent 3207a3a291
commit a598523787
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
t/t7508-status.sh
View File

@ -271,6 +271,15 @@ test_expect_success 'status -s -b' '
' '
test_expect_success 'status -s -z -b' '
tr "\\n" Q <expect >expect.q &&
mv expect.q expect &&
git status -s -z -b >output &&
nul_to_q <output >output.q &&
mv output.q output &&
test_cmp expect output
'
test_expect_success 'setup dir3' ' test_expect_success 'setup dir3' '
mkdir dir3 && mkdir dir3 &&
: >dir3/untracked1 && : >dir3/untracked1 &&

7
wt-status.c
View File

@ -889,8 +889,8 @@ static void wt_shortstatus_print_tracking(struct wt_status *s)
if (s->is_initial) if (s->is_initial)
color_fprintf(s->fp, header_color, _("Initial commit on ")); color_fprintf(s->fp, header_color, _("Initial commit on "));
if (!stat_tracking_info(branch, &num_ours, &num_theirs)) { if (!stat_tracking_info(branch, &num_ours, &num_theirs)) {
color_fprintf_ln(s->fp, branch_color_local, color_fprintf(s->fp, branch_color_local, "%s", branch_name);
"%s", branch_name); fputc(s->null_termination ? '\0' : '\n', s->fp);
return; return;
} }
@ -914,7 +914,8 @@ static void wt_shortstatus_print_tracking(struct wt_status *s)
color_fprintf(s->fp, branch_color_remote, "%d", num_theirs); color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
} }
color_fprintf_ln(s->fp, header_color, "]"); color_fprintf(s->fp, header_color, "]");
fputc(s->null_termination ? '\0' : '\n', s->fp);
} }
void wt_shortstatus_print(struct wt_status *s, int show_branch) void wt_shortstatus_print(struct wt_status *s, int show_branch)