From: Jonathan Nieder Date: Sat, 3 Apr 2010 19:52:17 +0000 (-0500) Subject: Teach mailinfo %< as an alternative scissors mark X-Git-Tag: v1.7.1-rc1~8^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9974e290e7c207de569ee24356253a69e5955e67;p=git.git Teach mailinfo %< as an alternative scissors mark Handle perforations found “in the wild” more robustly by recognizing “%<” as an alternative scissors mark. This feature is only meant to support old habits. Discourage new use of the percent-based version by only documenting the 8< symbol so new users’ perforations can still be recognized by old versions of Git. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- diff --git a/builtin/mailinfo.c b/builtin/mailinfo.c index ce2ef6bed..4a9729b9b 100644 --- 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;