From: Junio C Hamano <junkio@cox.net>
Date: Mon, 22 May 2006 07:33:34 +0000 (-0700)
Subject: Merge branch 'master' into next
X-Git-Tag: v1.4.1-rc1~75
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b05b52027c0e43abc9629049944283729a07899f?hp=-c

Merge branch 'master' into next

* master:
diff: minor option combination fix.
---

b05b52027c0e43abc9629049944283729a07899f
diff --combined diff.c
index d8c00dbc46,1601783679..7f35e595c9
--- 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)
  {
@@@ -1304,6 -1303,14 +1304,14 @@@ int diff_setup_done(struct diff_option
  	    (options->output_format == DIFF_FORMAT_CHECKDIFF))
  		options->recursive = 1;
  
+ 	/*
+ 	 * These combinations do not make sense.
+ 	 */
+ 	if (options->output_format == DIFF_FORMAT_RAW)
+ 		options->with_raw = 0;
+ 	if (options->output_format == DIFF_FORMAT_DIFFSTAT)
+ 		options->with_stat  = 0;
+ 
  	if (options->detect_rename && options->rename_limit < 0)
  		options->rename_limit = diff_rename_limit_default;
  	if (options->setup & DIFF_SETUP_USE_CACHE) {
@@@ -1981,10 -1988,7 +1989,10 @@@ void diff_flush(struct diff_options *op
  		show_stats(diffstat);
  		free(diffstat);
  		diffstat = NULL;
 -		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];