xdiff-interface.c: strip newline (and cr) from line before pattern matching

diff --git a/patch-id.c b/patch-id.c
index edbc4aa3e82974168f2d4c21085bdd43b774d55e..9349bc5580456b378d41da7cc2518e4fa9a7e81a 100644 (file)
--- a/patch-id.c
+++ b/patch-id.c
@@ -42,10 +42,12 @@ static void generate_id_list(void)
 
                if (!memcmp(line, "diff-tree ", 10))
                        p += 10;
+               else if (!memcmp(line, "commit ", 7))
+                       p += 7;
 
                if (!get_sha1_hex(p, n)) {
                        flush_current_id(patchlen, sha1, &ctx);
-                       memcpy(sha1, n, 20);
+                       hashcpy(sha1, n);
                        patchlen = 0;
                        continue;
                }
@@ -79,4 +81,4 @@ int main(int argc, char **argv)
 
        generate_id_list();
        return 0;
-}      
+}