Merge branch 'fix'

* fix:
  Document git-clone --reference
  Fix filename scaling for binary files
This commit is contained in:
Junio C Hamano
2006-04-19 02:25:29 -07:00
2 changed files with 24 additions and 4 deletions

7
diff.c
View File

@ -250,13 +250,14 @@ static void show_stats(struct diffstat_t* data)
for (i = 0; i < data->nr; i++) {
struct diffstat_file *file = data->files[i];
len = strlen(file->name);
if (max_len < len)
max_len = len;
if (file->is_binary || file->is_unmerged)
continue;
if (max_change < file->added + file->deleted)
max_change = file->added + file->deleted;
len = strlen(file->name);
if (max_len < len)
max_len = len;
}
for (i = 0; i < data->nr; i++) {