Re: please strip MIME-Version and Content-T{ype,ransfer-Encoding} in git am --scissors
- From
Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
- Date
- Oct 8, 2015, 19:37 UTC
- Message-ID
- <20151008193707.GT3982@pengutronix.de>
- In-Reply-To
- <xmqqvbahqhw1.fsf@gitster.mtv.corp.google.com>
Hello Junio,
On Thu, Oct 08, 2015 at 12:28:46PM -0700, Junio C Hamano wrote:
Show 33 quoted lines
> Uwe Kleine-König <u.kleine-koenig@pengutronix.de> writes:
>
> > Hello,
> >
> > when applying the mail below (without the '> ' prefix) using git am
> > --scissors the result looks like:
> >
> > $ git show
> > commit 26ef0606927cc1979faa4166d7f9f3584b5cdc61
> > Author: Tony Lindgren <tony@atomide.com>
> > Date: Tue Oct 6 05:36:17 2015 -0700
> >
> > 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.
> >
> > [...]
> >
> > $ git version
> > git version 2.6.0
> >
> > The obvious improvement is to strip all headers like git am does without
> > --scissors.
>
> 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@dude.ptx:~/gsrc/linux$ head ~/tmp/1444332661.3982_89.ptx\:2\,RS From: Tony Lindgren <tony@atomide.com> 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.
ukl@dude.ptx:~/gsrc/linux$ git am ~/tmp/1444332661.3982_89.ptx\:2\,RS Applying: memory: omap-gpmc: Fix unselectable debug option for GPMC ukl@dude.ptx:~/gsrc/linux$ git cat-file commit HEAD tree bab01e3e0d0bdd715b86cf7d5c9e8bb9768a30dc parent c6fa8e6de3dc420cba092bf155b2ed25bcd537f7 author Tony Lindgren <tony@atomide.com> 1444134977 -0700 committer Uwe Kleine-König <u.kleine-koenig@pengutronix.de> 1444332782 +0200
memory: omap-gpmc: Fix unselectable debug option for GPMC
Commit 63aa945b1013 ("memory: omap-gpmc: Add Kconfig option for debug") added a debug option for GPMC, but somehow managed to keep it unselectable.
This probably happened because I had some uncommitted changes and the GPMC option is selected in the platform specific Kconfig.
Let's also update the description a bit, it does not mention that enabling the debug option also disables the reset of GPMC controller during the init as pointed out by Uwe Kleine-König <u.kleine-koenig@pengutronix.de> and Roger Quadros <rogerq@ti.com>.
Fixes: 63aa945b1013 ("memory: omap-gpmc: Add Kconfig option for debug")
Reported-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>> 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.
Show 6 quoted lines
> 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").
That sound's right.
> > If someone wants a bounce of the original mail, just ask per PM. > > I have no idea what you are talking about here...
The result would be that a copy of the original mail would hit your mailbox if you asked per private mail (PM).
Best regards Uwe
-- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | http://www.pengutronix.de/ |