diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-10-09 19:17:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-10-09 19:17:43 -0700 |
| commit | 2af60a0521a8d0514e8bb1ca371cc9d502ea1c58 (patch) | |
| tree | 35ef8adb4a0d11f22aac2b9bd446f9df73420483 /patch-id.c | |
| parent | 305a5c78bf4459c0aefb1b7d7b59ea53e2c4b036 (diff) | |
| parent | fb8024b414b417d85ce215eba3dd23c188500c15 (diff) | |
| download | git-2af60a0521a8d0514e8bb1ca371cc9d502ea1c58.tar.gz | |
Merge branch 'fixes'
Diffstat (limited to 'patch-id.c')
| -rw-r--r-- | patch-id.c | 4 |
1 files changed, 4 insertions, 0 deletions
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; |