From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Jan 2017 22:49:28 +0000 (-0800)
Subject: Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maint
X-Git-Tag: v2.11.1~56
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7479ca4b44193acee43c480ae37e0bec98316f7a

Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maint

Fix a corner case in merge-recursive regression that crept in
during 2.10 development cycle.

* jc/renormalize-merge-kill-safer-crlf:
convert: git cherry-pick -Xrenormalize did not work
merge-recursive: handle NULL in add_cacheinfo() correctly
cherry-pick: demonstrate a segmentation fault
---

7479ca4b44193acee43c480ae37e0bec98316f7a
diff --cc merge-recursive.c
index e64b48b25d,56385d4c01..214f5a693b
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@@ -235,6 -213,8 +235,8 @@@ static int add_cacheinfo(struct merge_o
  		struct cache_entry *nce;
  
  		nce = refresh_cache_entry(ce, CE_MATCH_REFRESH | CE_MATCH_IGNORE_MISSING);
+ 		if (!nce)
 -			return error(_("addinfo_cache failed for path '%s'"), path);
++			return err(o, _("addinfo_cache failed for path '%s'"), path);
  		if (nce != ce)
  			ret = add_cache_entry(nce, options);
  	}