diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-16 16:47:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-16 16:47:25 -0700 |
| commit | bd2700dbdf6551c646bc4d68b6230b63ca6eaea3 (patch) | |
| tree | 3508a48d15872c36dcd7f8f864c4f5cecd00b5f9 /builtin | |
| parent | 5b8aac32fbf5be49e2cdfbdb082fa6bca9548d24 (diff) | |
| parent | 2485eab55cc0dcab34311ecd0ac52038aa9d9db4 (diff) | |
| download | git-bd2700dbdf6551c646bc4d68b6230b63ca6eaea3.tar.gz git-bd2700dbdf6551c646bc4d68b6230b63ca6eaea3.tar.xz | |
Merge branch 'mg/patch-id' into maint
* 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 512530022..49a0472a9 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; |