git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-03-15 17:42:52 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

Merge branch 'jc/maint-diff-patch-header'

Browse Source 
By Junio C Hamano
* jc/maint-diff-patch-header:
  diff -p: squelch "diff --git" header for stat-dirty paths
  t4011: illustrate "diff-index -p" on stat-dirty paths
  t4011: modernise style
This commit is contained in:
Junio C Hamano
2012-03-06 14:53:07 -08:00
parent f4464a3b7c b3f01ff29f
commit 239d6eddcd
2 changed files with 111 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
diff.c
View File

@@ -2255,7 +2255,7 @@ static void builtin_diff(const char *name_a,
struct emit_callback ecbdata;
const struct userdiff_funcname *pe;
if (!DIFF_XDL_TST(o, WHITESPACE_FLAGS) || must_show_header) {
if (must_show_header) {
fprintf(o->file, "%s", header.buf);
strbuf_reset(&header);
}