From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 20 Aug 2008 23:18:16 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.1-rc1~338
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e28a8670a66125aa29d7a5ea10052c0f6824c2ba;p=git.git

Merge branch 'maint'

* maint:
  Update draft release notes for 1.6.0.1
  Add hints to revert documentation about other ways to undo changes
  Install templates with the user and group of the installing personality
  "git-merge": allow fast-forwarding in a stat-dirty tree
  completion: find out supported merge strategies correctly
  decorate: allow const objects to be decorated
  for-each-ref: cope with tags with incomplete lines
  diff --check: do not get confused by new blank lines in the middle
  remote.c: remove useless if-before-free test
  mailinfo: avoid violating strbuf assertion
  git format-patch: avoid underrun when format.headers is empty or all NLs
---

e28a8670a66125aa29d7a5ea10052c0f6824c2ba
diff --cc diff.c
index 10d54405d,f70e6b491..5923fe281
--- a/diff.c
+++ b/diff.c
@@@ -1628,9 -1627,11 +1628,10 @@@ static void builtin_checkdiff(const cha
  		xdemitcb_t ecb;
  
  		memset(&xecfg, 0, sizeof(xecfg));
+ 		xecfg.ctxlen = 1; /* at least one context line */
  		xpp.flags = XDF_NEED_MINIMAL;
 -		ecb.outf = xdiff_outf;
 -		ecb.priv = &data;
 -		xdi_diff(&mf1, &mf2, &xpp, &xecfg, &ecb);
 +		xdi_diff_outf(&mf1, &mf2, checkdiff_consume, &data,
 +			      &xpp, &xecfg, &ecb);
  
  		if ((data.ws_rule & WS_TRAILING_SPACE) &&
  		    data.trailing_blanks_start) {