Re: [PATCH] Teach mailinfo to ignore everything before -- >8 -- mark
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:47:18
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-08-13 · Re: [PATCH] Teach mailinfo to ignore everything before -- >8 -- mark · Nanako Shiraishi <hidden>
- 2016-06-15 · [PATCH] Teach mailinfo to ignore everything before -- >8 -- mark · Nicolas Sebrecht <hidden>
- 2016-06-15 · Re: [PATCH] Teach mailinfo to ignore everything before -- >8 -- mark · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] Teach mailinfo to ignore everything before -- >8 -- mark · Nanako Shiraishi <hidden>
Try this patch, perhaps? I forgot to reset the mysteriously named s_hdr buffer. Does anybody remember what these s_hdr (vs p_hdr) buffers stand for, by the way? -- >8 -- cut here -- >8 -- Subject: [PATCH] squashme to 925bd84 (Teach mailinfo to ignore everything before -- >8 -- mark, 2009-08-23) builtin-mailinfo.c | 6 ++++++ t/t5100/sample.mbox | 4 ++++ 2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
index 26548f0..8a3a184 100644
--- a/builtin-mailinfo.c
+++ b/builtin-mailinfo.c@@ -758,9 +758,15 @@ static int handle_commit_msg(struct strbuf *line) } if (scissors(line)) { + int i; rewind(cmitmsg); ftruncate(fileno(cmitmsg), 0); still_looking = 1; + for (i = 0; header[i]; i++) { + if (s_hdr_data[i]) + strbuf_release(s_hdr_data[i]); + s_hdr_data[i] = NULL; + } return 0; }
diff --git a/t/t5100/sample.mbox b/t/t5100/sample.mbox
index 95b6842..2c3da52 100644
--- a/t/t5100/sample.mbox
+++ b/t/t5100/sample.mbox@@ -566,10 +566,14 @@ From: Junio Hamano <junkio@cox.net> Date: Thu, 20 Aug 2009 17:18:22 -0700 Subject: Why doesn't git-am does not like >8 scissors mark? +Subject: [PATCH] BLAH ONE + In real life, we will see a discussion that inspired this patch discussing related and unrelated things around >8 scissors mark in this part of the message. +Subject: [PATCH] BLAH TWO + And the we will see the scissors. -- >8 -- cut here -- 8< --