Merge branch 'fixes'

diff --git a/patch-id.c b/patch-id.c
index 0bd640cc481eddc72e37a864b115f4d6ba7883b1..960e7cedf9d55f8a8fa9dba38a2b69d5f622212d 100644 (file)
--- 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)
 {