From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 22 Jun 2008 21:33:02 +0000 (-0700)
Subject: Merge branch 'jk/test'
X-Git-Tag: v1.6.0-rc0~233
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6419cd556696a77e55ec21c260b36571e9e53c12?ds=inline;hp=-c

Merge branch 'jk/test'

* jk/test:
enable whitespace checking of test scripts
avoid trailing whitespace in zero-change diffstat lines
avoid whitespace on empty line in automatic usage message
mask necessary whitespace policy violations in test scripts
fix whitespace violations in test scripts
---

6419cd556696a77e55ec21c260b36571e9e53c12
diff --combined diff.c
index 5262490086,f77f9e9447..44e8790690
--- a/diff.c
+++ b/diff.c
@@@ -514,15 -514,9 +514,15 @@@ const char *diff_get_color(int diff_use
  
  static void emit_line(FILE *file, const char *set, const char *reset, const char *line, int len)
  {
 +	int has_trailing_newline = (len > 0 && line[len-1] == '\n');
 +	if (has_trailing_newline)
 +		len--;
 +
  	fputs(set, file);
  	fwrite(line, len, 1, file);
  	fputs(reset, file);
 +	if (has_trailing_newline)
 +		fputc('\n', file);
  }
  
  static void emit_add_line(const char *reset, struct emit_callback *ecbdata, const char *line, int len)
@@@ -928,7 -922,8 +928,8 @@@ static void show_stats(struct diffstat_
  			total = add + del;
  		}
  		show_name(options->file, prefix, name, len, reset, set);
- 		fprintf(options->file, "%5d ", added + deleted);
+ 		fprintf(options->file, "%5d%s", added + deleted,
+ 				added + deleted ? " " : "");
  		show_graph(options->file, '+', add, add_c, reset);
  		show_graph(options->file, '-', del, del_c, reset);
  		fprintf(options->file, "\n");