Merge branch 'jc/c99'

diff --git a/patch-id.c b/patch-id.c
index edbc4aa3e82974168f2d4c21085bdd43b774d55e..3b4c80f764bd11a740a7cce60f2e8c062706e897 100644 (file)
--- a/patch-id.c
+++ b/patch-id.c
@@ -42,6 +42,8 @@ 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);