From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 22 Jun 2008 07:21:28 +0000 (-0700)
Subject: git-rerere: detect unparsable conflicts
X-Git-Tag: v1.6.0-rc0~120^2~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a1b32fdc3d1d05395f186bfa06e92174519dab8d;p=git.git

git-rerere: detect unparsable conflicts

rerere did not detect the case where <<< === >>> markers did not match.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin-rerere.c b/builtin-rerere.c
index 610b96a12..addc5c73d 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;
 }