diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-04-03 14:52:17 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-04 10:17:55 -0700 |
| commit | 9974e290e7c207de569ee24356253a69e5955e67 (patch) | |
| tree | a2a58cbc900e1997434bf49551db8224fbef5b9e /builtin/mailinfo.c | |
| parent | 6555b196f00128f13ab8f719ee1e156238f16bb3 (diff) | |
| download | git-9974e290e7c207de569ee24356253a69e5955e67.tar.gz git-9974e290e7c207de569ee24356253a69e5955e67.tar.xz | |
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 <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/mailinfo.c')
| -rw-r--r-- | builtin/mailinfo.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; |