[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <YK5ZDtEDmwpxisH1@hirez.programming.kicks-ass.net>
Date: Wed, 26 May 2021 16:19:58 +0200
From: Peter Zijlstra <peterz@...radead.org>
To: Junio C Hamano <gitster@...ox.com>
Cc: Mark Rutland <mark.rutland@....com>,
"Linux-Kernel@...r. Kernel. Org" <linux-kernel@...r.kernel.org>,
will@...nel.org, boqun.feng@...il.com, aou@...s.berkeley.edu,
arnd@...db.de, bcain@...eaurora.org, benh@...nel.crashing.org,
chris@...kel.net, dalias@...c.org, davem@...emloft.net,
deanbo422@...il.com, deller@....de, geert@...ux-m68k.org,
gerg@...ux-m68k.org, green.hu@...il.com, guoren@...nel.org,
ink@...assic.park.msu.ru, James.Bottomley@...senpartnership.com,
jcmvbkbc@...il.com, jonas@...thpole.se, ley.foon.tan@...el.com,
linux@...linux.org.uk, mattst88@...il.com, monstr@...str.eu,
mpe@...erman.id.au, nickhu@...estech.com, palmerdabbelt@...gle.com,
paulus@...ba.org, paul.walmsley@...ive.com, rth@...ddle.net,
shorne@...il.com, stefan.kristiansson@...nalahti.fi,
tsbogend@...ha.franken.de, vgupta@...opsys.com,
ysato@...rs.sourceforge.jp
Subject: Re: [PATCH v2 00/33] locking/atomic: convert all architectures to
ARCH_ATOMIC
On Wed, May 26, 2021 at 09:29:12PM +0900, Junio C Hamano wrote:
> > On Tue, May 25, 2021 at 03:01:59PM +0100, Mark Rutland wrote:
> > > Note: I've generated the patches with:
> > >
> > > git format-patch -C -M -D
> > >
> > > ... so the preimage of include/linux/atomic-fallback.h is not included
> > > in the diff when it is deleted.
> > ...
> > Junio; can we get something like the below sorted?
>
> Funny, I recently looked at "git format-patch --help" and read that "-D"
> is explicitly described as "The resulting patch is not meant to be applied
> with patch or git apply; this is solely for people who want to just
> concentrate on reviewing the text after the change."
Yeah, I read that too; but like I said, I feel strongly that anything
generated by git-format-patch should be accepted by git-apply (albeit
with a --do-what-I-want argument, I agree that -D output should never be
applied without express permission).
> So, no, I think it is anti-social to send such a patch generated with -D
> unless it is purely for discussion. The side that generates the patch
> should be told to drop "-D" when running the format-patch command,
> or perhaps format-patch should be taught to error out when "-D" is
> given, perhaps?
Removing -D from git-format-patch works too, although I rather like not
seeing the '-' for the entire files. I really don't care much for the
reversible thing, I already have the content, I can zap the commit to
get it back.
I'll leave it up to you, either remove -D from format-patch, or add an
option to apply to force accept it.
Powered by blists - more mailing lists