From: Junio C Hamano <junkio@cox.net>
Date: Wed, 19 Apr 2006 09:25:29 +0000 (-0700)
Subject: Merge branch 'fix'
X-Git-Tag: v1.4.1-rc1~203^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/85e6326cc3e7c272566c60a39741f84391830d49?ds=inline;hp=-c

Merge branch 'fix'

* fix:
Document git-clone --reference
Fix filename scaling for binary files
---

85e6326cc3e7c272566c60a39741f84391830d49
diff --combined diff.c
index d75e0178ff,903afa1689..0a832c3585
--- a/diff.c
+++ b/diff.c
@@@ -250,13 -250,14 +250,14 @@@ static void show_stats(struct diffstat_
  	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++) {
@@@ -1035,7 -1036,8 +1036,7 @@@ int diff_setup_done(struct diff_option
  	 * recursive bits for other formats here.
  	 */
  	if ((options->output_format == DIFF_FORMAT_PATCH) ||
 -	    (options->output_format == DIFF_FORMAT_DIFFSTAT) ||
 -	    (options->with_stat))
 +	    (options->output_format == DIFF_FORMAT_DIFFSTAT))
  		options->recursive = 1;
  
  	if (options->detect_rename && options->rename_limit < 0)