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

diff --cc convert.c
Simple merge

diff --cc merge-recursive.c
index e64b48b25da2a53851aa40cf149e510641c23a8d,56385d4c01b732b77fdf463408109f8d3ca67be8..214f5a693bbbfdc5a6da5727dbad7830f83748dd
--- 1/merge-recursive.c
--- 2/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);
 -                      return error(_("addinfo_cache failed for path '%s'"), path);
+               if (!nce)
++                      return err(o, _("addinfo_cache failed for path '%s'"), path);
                if (nce != ce)
                        ret = add_cache_entry(nce, options);
        }

diff --cc t/t3501-revert-cherry-pick.sh
Simple merge