diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2016-11-26 13:48:06 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-11-28 11:00:04 -0800 |
| commit | 55e9f0e5c9a918c246b7eae1fe2a2e954f6426af (patch) | |
| tree | 2cf4d7c8f11a4da2089ae41ebab4ff280f81e417 | |
| parent | 05f2dfb965476a59050b7c3446b1281bdcac7051 (diff) | |
| download | git-55e9f0e5c9a918c246b7eae1fe2a2e954f6426af.tar.gz | |
merge-recursive: handle NULL in add_cacheinfo() correctly
1335d76e45 ("merge: avoid "safer crlf" during recording of merge
results", 2016-07-08) tried to split make_cache_entry() call made
with CE_MATCH_REFRESH into a call to make_cache_entry() without one,
followed by a call to add_cache_entry(), refresh_cache() and another
add_cache_entry() as needed. However the conversion was botched in
that it forgot that refresh_cache() can return NULL, which was
handled correctly in make_cache_entry() but in the updated code.
This fixes https://github.com/git-for-windows/git/issues/952
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | merge-recursive.c | 2 | ||||
| -rwxr-xr-x | t/t3501-revert-cherry-pick.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index de37e5153c..56385d4c01 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -213,6 +213,8 @@ static int add_cacheinfo(unsigned int mode, const unsigned char *sha1, 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); if (nce != ce) ret = add_cache_entry(nce, options); } diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh index 5bef564ff1..22970d2223 100755 --- a/t/t3501-revert-cherry-pick.sh +++ b/t/t3501-revert-cherry-pick.sh @@ -141,7 +141,7 @@ test_expect_success 'cherry-pick "-" works with arguments' ' test_cmp expect actual ' -test_expect_failure 'cherry-pick works with dirty renamed file' ' +test_expect_success 'cherry-pick works with dirty renamed file' ' test_commit to-rename && git checkout -b unrelated && test_commit unrelated && |