Browse Source

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 <kai.ruemmler@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Kai Ruemmler 20 years ago committed by Junio C Hamano
parent
commit
9fabdedc0e
  1. 4
      patch-id.c

4
patch-id.c

@ -55,6 +55,10 @@ static void generate_id_list(void) @@ -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;

Loading…
Cancel
Save