X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=patch-id.c;h=edbc4aa3e82974168f2d4c21085bdd43b774d55e;hb=e974c9ab03c3c149bfc7da663167c6e59a7659f7;hp=0bd640cc481eddc72e37a864b115f4d6ba7883b1;hpb=85c1f337be49eaa9a22e42a1c9958deef5ab57c3;p=thirdparty%2Fgit.git

diff --git a/patch-id.c b/patch-id.c
index 0bd640cc48..edbc4aa3e8 100644
--- a/patch-id.c
+++ b/patch-id.c
@@ -1,4 +1,3 @@
-#include <ctype.h>
 #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;
@@ -67,7 +70,7 @@ static void generate_id_list(void)
 	flush_current_id(patchlen, sha1, &ctx);
 }
 
-static const char patch_id_usage[] = "usage: git-patch-id < patch";
+static const char patch_id_usage[] = "git-patch-id < patch";
 
 int main(int argc, char **argv)
 {