Skip to content

Commit

Permalink
Teach mailinfo %< as an alternative scissors mark
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jonathan Nieder authored and Junio C Hamano committed Apr 4, 2010
1 parent 6555b19 commit 9974e29
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion builtin/mailinfo.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 9974e29

Please sign in to comment.