rerere: recalculate conflict ID when unresolved conflict is committed

diff --git a/gpg-interface.c b/gpg-interface.c
index 3414af38b9d1b7ff8be0f3d24e9086a1059b1717..0647bd6348cdedd0e32f30ed23934d390eae4122 100644 (file)
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -101,15 +101,26 @@ void print_signature_buffer(const struct signature_check *sigc, unsigned flags)
                fputs(output, stderr);
 }
 
+static int is_gpg_start(const char *line)
+{
+       return starts_with(line, PGP_SIGNATURE) ||
+               starts_with(line, PGP_MESSAGE);
+}
+
 size_t parse_signature(const char *buf, size_t size)
 {
        size_t len = 0;
-       while (len < size && !starts_with(buf + len, PGP_SIGNATURE) &&
-                       !starts_with(buf + len, PGP_MESSAGE)) {
-               const char *eol = memchr(buf + len, '\n', size - len);
+       size_t match = size;
+       while (len < size) {
+               const char *eol;
+
+               if (is_gpg_start(buf + len))
+                       match = len;
+
+               eol = memchr(buf + len, '\n', size - len);
                len += eol ? eol - (buf + len) + 1 : size - len;
        }
-       return len;
+       return match;
 }
 
 void set_signing_key(const char *key)