diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-01-17 14:49:28 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-17 14:49:28 -0800 |
| commit | 7479ca4b44193acee43c480ae37e0bec98316f7a (patch) | |
| tree | 60792ba401dcb07ccd2ef285b3b55badc56ac525 /merge-recursive.c | |
| parent | cf479b4fb5d8417ccea306fa9f3491ec2e873399 (diff) | |
| parent | 1c25d2d8ed4c5154c9059918e20e75cda3bede81 (diff) | |
| download | git-7479ca4b44193acee43c480ae37e0bec98316f7a.tar.gz git-7479ca4b44193acee43c480ae37e0bec98316f7a.tar.xz | |
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
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index e64b48b25..214f5a693 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -235,6 +235,8 @@ static int add_cacheinfo(struct merge_options *o, struct cache_entry *nce; nce = refresh_cache_entry(ce, CE_MATCH_REFRESH | CE_MATCH_IGNORE_MISSING); + if (!nce) + return err(o, _("addinfo_cache failed for path '%s'"), path); if (nce != ce) ret = add_cache_entry(nce, options); } |