Skip to content

Commit

Permalink
Merge branch 'jc/numstat'
Browse files Browse the repository at this point in the history
* jc/numstat:
  apply --numstat: mark binary diffstat with - -, not 0 0
  • Loading branch information
Junio C Hamano committed Nov 24, 2006
2 parents 5b6be4c + ef58d95 commit 54acddc
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion builtin-apply.c
Original file line number Diff line number Diff line change
Expand Up @@ -2119,7 +2119,11 @@ static void numstat_patch_list(struct patch *patch)
for ( ; patch; patch = patch->next) {
const char *name;
name = patch->new_name ? patch->new_name : patch->old_name;
printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);
if (patch->is_binary)
printf("-\t-\t");
else
printf("%d\t%d\t",
patch->lines_added, patch->lines_deleted);
if (line_termination && quote_c_style(name, NULL, NULL, 0))
quote_c_style(name, NULL, stdout, 0);
else
Expand Down

0 comments on commit 54acddc

Please sign in to comment.