diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-02-27 21:58:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-27 21:58:30 -0800 |
| commit | c8cdbf2badcc500ec68c506a3b4bda9b1e18995f (patch) | |
| tree | 319dadc562b6b4b8a607ec262f07fed482ce9acc /builtin | |
| parent | Merge branch 'mz/rerere-remaining' (diff) | |
| parent | git-patch-id: do not trip over "no newline" markers (diff) | |
| download | tgif-c8cdbf2badcc500ec68c506a3b4bda9b1e18995f.tar.xz | |
Merge branch 'mg/patch-id'
* mg/patch-id:
git-patch-id: do not trip over "no newline" markers
git-patch-id: test for "no newline" markers
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/patch-id.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/patch-id.c b/builtin/patch-id.c index 512530022e..49a0472a9b 100644 --- a/builtin/patch-id.c +++ b/builtin/patch-id.c @@ -73,6 +73,8 @@ int get_one_patchid(unsigned char *next_sha1, git_SHA_CTX *ctx) p += 7; else if (!memcmp(line, "From ", 5)) p += 5; + else if (!memcmp(line, "\\ ", 2) && 12 < strlen(line)) + continue; if (!get_sha1_hex(p, next_sha1)) { found_next = 1; |