Merge branch 'fix'
* fix:
Separate object name errors from usage errors
Documentation: {caret} fixes (git-rev-list.txt)
Fix "git diff --stat" with long filenames
Fix repo-config set-multivar error return path.
This commit is contained in:
2
diff.c
2
diff.c
@ -296,7 +296,6 @@ static const char minuses[]= "--------------------------------------------------
|
||||
|
||||
static void show_stats(struct diffstat_t* data)
|
||||
{
|
||||
char *prefix = "";
|
||||
int i, len, add, del, total, adds = 0, dels = 0;
|
||||
int max, max_change = 0, max_len = 0;
|
||||
int total_files = data->nr;
|
||||
@ -318,6 +317,7 @@ static void show_stats(struct diffstat_t* data)
|
||||
}
|
||||
|
||||
for (i = 0; i < data->nr; i++) {
|
||||
char *prefix = "";
|
||||
char *name = data->files[i]->name;
|
||||
int added = data->files[i]->added;
|
||||
int deleted = data->files[i]->deleted;
|
||||
|
||||
Reference in New Issue
Block a user