X-Git-Url: https://git.octo.it/?p=git.git;a=blobdiff_plain;f=patch-id.c;h=edbc4aa3e82974168f2d4c21085bdd43b774d55e;hp=5a8dc75d0e0184f8a4afa53e22b44d20f060685f;hb=HEAD;hpb=54c6870ebf4c364dd809a1a58eb8485855344812 diff --git a/patch-id.c b/patch-id.c index 5a8dc75d..edbc4aa3 100644 --- a/patch-id.c +++ b/patch-id.c @@ -1,4 +1,3 @@ -#include #include "cache.h" static void flush_current_id(int patchlen, unsigned char *id, SHA_CTX *c) @@ -55,6 +54,10 @@ static void generate_id_list(void) if (!patchlen && memcmp(line, "diff ", 5)) continue; + /* Ignore git-diff index header */ + if (!memcmp(line, "index ", 6)) + continue; + /* Ignore line numbers when computing the SHA1 of the patch */ if (!memcmp(line, "@@ -", 4)) continue;