From: Junio C Hamano <junkio@cox.net>
Date: Wed, 24 May 2006 10:32:31 +0000 (-0700)
Subject: Merge branch 'master' into next
X-Git-Tag: v1.4.1-rc1~64
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f54c76f1616cf470ce4bce8eff749272e1c6548c?hp=-c

Merge branch 'master' into next

* 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
---

f54c76f1616cf470ce4bce8eff749272e1c6548c
diff --combined diff.c
index a7bb9b95bd,77c09a87b0..9e9cfc8b75
--- a/diff.c
+++ b/diff.c
@@@ -299,7 -299,6 +299,7 @@@ static void diffstat_consume(void *priv
  
  static const char pluses[] = "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
  static const char minuses[]= "----------------------------------------------------------------------";
 +const char mime_boundary_leader[] = "------------";
  
  static void show_stats(struct diffstat_t* data)
  {
@@@ -1989,10 -1988,10 +1989,13 @@@ void diff_flush(struct diff_options *op
  		show_stats(diffstat);
  		free(diffstat);
  		diffstat = NULL;
+ 		if (options->summary)
+ 			for (i = 0; i < q->nr; i++)
+ 				diff_summary(q->queue[i]);
 -		putchar(options->line_termination);
 +		if (options->stat_sep)
 +			fputs(options->stat_sep, stdout);
 +		else
 +			putchar(options->line_termination);
  	}
  	for (i = 0; i < q->nr; i++) {
  		struct diff_filepair *p = q->queue[i];
@@@ -2005,7 -2004,7 +2008,7 @@@
  	}
  
  	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]);
  	}