From: Junio C Hamano Date: Sun, 22 Jun 2008 09:47:46 GMT Subject: [PATCH 2/5] git-rerere: detect unparsable conflicts Message-ID: <7viqw1ol6l.fsf@gitster.siamese.dyndns.org> In-Reply-To: <7vskvd9kai.fsf@gitster.siamese.dyndns.org> rerere did not detect the case where <<< === >>> markers did not match. Signed-off-by: Junio C Hamano --- builtin-rerere.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/builtin-rerere.c b/builtin-rerere.c index 610b96a..addc5c7 100644 --- a/builtin-rerere.c +++ b/builtin-rerere.c @@ -144,6 +144,11 @@ static int handle_file(const char *path, fclose(out); if (sha1) SHA1_Final(sha1, &ctx); + if (hunk) { + if (output) + unlink(output); + return error("Could not parse conflict hunks in %s", path); + } return hunk_no; } -- 1.5.6.12.g73f03