Hello Junio, On Thu, Oct 08, 2015 at 01:04:01PM -0700, Junio C Hamano wrote: > Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> writes: > > >> Does this have anything to do with scissors, though? If you remove > >> everything before "8< ---" in the body of Tony's message (i.e. keep > >> the in-body headers starting with "From:" and ending with CTE) and > >> try again, I would suspect that you will get the same result. > > No, you're wrong here: > > > > ukl@xxxxxxxx:~/gsrc/linux$ head ~/tmp/1444332661.3982_89.ptx\:2\,RS > > From: Tony Lindgren <tony@xxxxxxxxxxx> > > Date: Tue, 6 Oct 2015 05:36:17 -0700 > > Subject: [PATCH] memory: omap-gpmc: Fix unselectable debug option for GPMC > > MIME-Version: 1.0 > > Content-Type: text/plain; charset=UTF-8 > > Content-Transfer-Encoding: 8bit > > > > Commit 63aa945b1013 ("memory: omap-gpmc: Add Kconfig option for debug") > > added a debug option for GPMC, but somehow managed to keep it unselectable. > > I think you are the one who misread my question. I said "keep the > in-body headers", didn't I? If you did the "head", then you would > see something like this: Ah got it. Yes, you're right. (Subject and Date are actually different between real and in-body headers, but that's not important. git am picks up the in-body headers.) > > ukl@xxxxxxxx:~/gsrc/linux$ head ~/tmp/1444332661.3982_89.ptx\:2\,RS > > From: Tony Lindgren <tony@xxxxxxxxxxx> > > Date: Tue, 6 Oct 2015 05:36:17 -0700 > > Subject: [PATCH] memory: omap-gpmc: Fix unselectable debug option for GPMC > > ... probably Received: and all other junk from your mailbox ... > > > > From: Tony Lindgren <tony@xxxxxxxxxxx> > > Date: Tue, 6 Oct 2015 05:36:17 -0700 > > Subject: [PATCH] memory: omap-gpmc: Fix unselectable debug option for GPMC > > MIME-Version: 1.0 > > Content-Type: text/plain; charset=UTF-8 > > Content-Transfer-Encoding: 8bit > > > > Commit 63aa945b1013 ("memory: omap-gpmc: Add Kconfig option for debug") > > added a debug option for GPMC, but somehow managed to keep it unselectable. > > >> I also think that the "MIME-Version" thing is what gives this; > >> mailinfo and am do not really use it, and consider that the in-body > >> header ends there. > > > > I failed to follow you here. > > I think if you tried the example with in-body header, you will see > what I meant. > > > > >> The right approach to tweak mailinfo to cope with this better would > >> be to keep a bit more state inside mailinfo.c::handle_commit_msg() > >> so that if we are (1) using in-body headers, (2) have already seen > >> _some_ valid in-body header like "Subject:" and "From: ", and (3) > >> have not seen a blank line, discard lines that we do not care about > >> (e.g. "MIME-VERSION: 1.0"). The right thing should also happen if MIME-Version comes above Subject in the body but other than that I'm with you here. Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | http://www.pengutronix.de/ | -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html