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

Merge branch 'master' into next

Browse Source 
* master:
  --summary output should print immediately after stats.
  git-svn: ignore expansion of svn:keywords
  git-svn: starting a 1.1.0-pre development version
  cvsimport: set up commit environment in perl instead of using env
This commit is contained in:
Junio C Hamano
2006-05-24 03:32:31 -07:00
parent 17cf39294a fad70686b2
commit f54c76f161
7 changed files with 265 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
diff.c
View File

@ -1989,6 +1989,9 @@ void diff_flush(struct diff_options *options)
show_stats(diffstat);
free(diffstat);
diffstat = NULL;
if (options->summary)
for (i = 0; i < q->nr; i++)
diff_summary(q->queue[i]);
if (options->stat_sep)
fputs(options->stat_sep, stdout);
else
@ -2005,7 +2008,7 @@ void diff_flush(struct diff_options *options)
}
for (i = 0; i < q->nr; i++) {
if (options->summary)
if (diffstat && options->summary)
diff_summary(q->queue[i]);
diff_free_filepair(q->queue[i]);
}