Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jn/mailinfo-scissors'
author
Junio C Hamano
<gitster@pobox.com>
Wed, 7 Apr 2010 22:34:06 +0000
(15:34 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 7 Apr 2010 22:34:06 +0000
(15:34 -0700)
* jn/mailinfo-scissors:
Teach mailinfo %< as an alternative scissors mark
builtin/mailinfo.c
patch
|
blob
|
history
raw
(from parent 1:
e3af3cf
)
diff --git
a/builtin/mailinfo.c
b/builtin/mailinfo.c
index ce2ef6bede40fde8823336bc85762bd3e7cd4760..4a9729b9b388a1e589e9250d8157e723c68140de 100644
(file)
--- a/
builtin/mailinfo.c
+++ b/
builtin/mailinfo.c
@@
-746,7
+746,8
@@
static int is_scissors_line(const struct strbuf *line)
continue;
}
if (i + 1 < len &&
- (!memcmp(buf + i, ">8", 2) || !memcmp(buf + i, "8<", 2))) {
+ (!memcmp(buf + i, ">8", 2) || !memcmp(buf + i, "8<", 2) ||
+ !memcmp(buf + i, ">%", 2) || !memcmp(buf + i, "%<", 2))) {
in_perforation = 1;
perforation += 2;
scissors += 2;