From: Junio C Hamano <junkio@cox.net>
Date: Fri, 24 Nov 2006 11:46:40 +0000 (-0800)
Subject: Merge branch 'jc/numstat'
X-Git-Tag: v1.5.0-rc0~232
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/54acddce99ee0260b7b0a47fda3e2f74c3b983c3?hp=-c

Merge branch 'jc/numstat'

* jc/numstat:
apply --numstat: mark binary diffstat with - -, not 0 0
---

54acddce99ee0260b7b0a47fda3e2f74c3b983c3
diff --combined builtin-apply.c
index 61f047fd45,b80ad2ce2e..436d9e1880
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@@ -140,15 -140,12 +140,15 @@@ struct fragment 
  struct patch {
  	char *new_name, *old_name, *def_name;
  	unsigned int old_mode, new_mode;
 -	int is_rename, is_copy, is_new, is_delete, is_binary;
 +	int is_new, is_delete;	/* -1 = unknown, 0 = false, 1 = true */
  	int rejected;
  	unsigned long deflate_origlen;
  	int lines_added, lines_deleted;
  	int score;
 -	int inaccurate_eof:1;
 +	unsigned int inaccurate_eof:1;
 +	unsigned int is_binary:1;
 +	unsigned int is_copy:1;
 +	unsigned int is_rename:1;
  	struct fragment *fragments;
  	char *result;
  	unsigned long resultsize;
@@@ -2119,7 -2116,11 +2119,11 @@@ static void numstat_patch_list(struct p
  	for ( ; patch; patch = patch->next) {
  		const char *name;
  		name = patch->new_name ? patch->new_name : patch->old_name;
- 		printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);
+ 		if (patch->is_binary)
+ 			printf("-\t-\t");
+ 		else
+ 			printf("%d\t%d\t",
+ 			       patch->lines_added, patch->lines_deleted);
  		if (line_termination && quote_c_style(name, NULL, NULL, 0))
  			quote_c_style(name, NULL, stdout, 0);
  		else