From 9fabdedc0edd4ff150197a53cc3032e7bf27c4d4 Mon Sep 17 00:00:00 2001 From: Kai Ruemmler Date: Sun, 9 Oct 2005 16:52:50 -0700 Subject: ignore new git-diff index header when computing patch ids Two else equal patches should not result in different checksums, only because they were applied to different versions of the file. Signed-off-by: Kai Ruemmler Signed-off-by: Junio C Hamano --- patch-id.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/patch-id.c b/patch-id.c index 5a8dc75d0e..960e7cedf9 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; -- cgit v1.2.3