X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=patch-id.c;h=960e7cedf9d55f8a8fa9dba38a2b69d5f622212d;hb=1d389ab65dc6867d3059d60bb2b3951bc01a185e;hp=0bd640cc481eddc72e37a864b115f4d6ba7883b1;hpb=98e031f0bb6e857c684e6db24d03d22cfc1a532a;p=git.git

diff --git a/patch-id.c b/patch-id.c
index 0bd640cc..960e7ced 100644
--- a/patch-id.c
+++ b/patch-id.c
@@ -55,6 +55,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 +71,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)
 {