Merge branch 'jc/numstat'
* jc/numstat: diff --numstat: show binary with '-' to match "apply --numstat"maint
commit
f5c589f1df
5
diff.c
5
diff.c
|
@ -802,7 +802,10 @@ static void show_numstat(struct diffstat_t* data, struct diff_options *options)
|
|||
for (i = 0; i < data->nr; i++) {
|
||||
struct diffstat_file *file = data->files[i];
|
||||
|
||||
printf("%d\t%d\t", file->added, file->deleted);
|
||||
if (file->is_binary)
|
||||
printf("-\t-\t");
|
||||
else
|
||||
printf("%d\t%d\t", file->added, file->deleted);
|
||||
if (options->line_termination &&
|
||||
quote_c_style(file->name, NULL, NULL, 0))
|
||||
quote_c_style(file->name, NULL, stdout, 0);
|
||||
|
|
Loading…
Reference in New Issue