From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: David Miller <davem@davemloft.net>
Subject: Re: format-patch on permission change gives empty patch
Date: Wed, 06 Oct 2010 21:40:05 -0700 [thread overview]
Message-ID: <7vocb6y5sq.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <7vtykyy70w.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Wed\, 06 Oct 2010 21\:13\:35 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> David Miller <davem@davemloft.net> writes:
>
>> From: David Miller <davem@davemloft.net>
>> Date: Wed, 06 Oct 2010 17:37:14 -0700 (PDT)
>>
>>>
>>> When I ask git to format-patch a commit that is just a file
>>> permission change, it ends up generating an empty file, not
>>> even the commit message is included.
>>
>> Ok it turns out that the commit in question was a NOP since the file
>> permissions didn't change.
>>
>> But even if the patch is truly empty, format-patch should still give
>> me the commit message shouldn't it?
>
> Probably; we have strongly encouraged people not to commit no-op, so I
> guess nobody stumbled upon this corner case.
>
> Perhaps something like this?
Actually, I have a feeling that this is not merely a corner case we didn't
care about.
A half-good news is that format-patch already takes --always command line
option to generate a message out of an empty commit, but because it cannot
be applied with "am", it is rather pointless.
BUT.
The weatherbaloon patch is probably a bad idea. "git rebase", especially
when rebasing a side branch imported from some foreign SCM, would rather
badly break with this patch, because its "format-patch | am" pipeline
depends on format-patch to skip a no-op commit. Otherwise, "am" will
complain about a patchless message. So in a sense, the current behaviour
is internally consistent and deliberately so.
I have a mixed feeling about where to go next.
(1) Treat "rebase" as a way to reproduce a reasonable history; the
current behaviour to drop empty commits is consistent with this view,
as a history with an empty commit is _not_ entirely reasonable.
(2) Treat "rebase" as a way to reproduce history faithfully, even an
unreasonable one. We could teach "--allow-empty" to "am", and
rewrite the pipeline as "format-patch --always | am --allow-empty" to
implement it.
I think I would eventually end up doing the latter, but not tonight.
next prev parent reply other threads:[~2010-10-07 4:40 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-07 0:37 format-patch on permission change gives empty patch David Miller
2010-10-07 0:40 ` David Miller
2010-10-07 4:13 ` Junio C Hamano
2010-10-07 4:40 ` Junio C Hamano [this message]
2010-10-07 8:15 ` Sverre Rabbelier
2010-10-07 10:05 ` Jakub Narebski
2010-10-07 10:12 ` Sverre Rabbelier
2010-10-07 19:06 ` Nicolas Pitre
2010-10-07 20:29 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vocb6y5sq.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=davem@davemloft.net \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).