git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: huebbe <nathanael.huebbe@informatik.uni-hamburg.de>
To: Jeff King <peff@peff.net>
Cc: Junio C Hamano <gitster@pobox.com>,
	Stefan Beller <sbeller@google.com>,
	stefan.naewe@atlas-elektronik.com, git@vger.kernel.org
Subject: Re: Bug: Incorrect stripping of the [PATCH] prefix in git-am
Date: Thu, 3 Dec 2015 11:32:22 +0100	[thread overview]
Message-ID: <56601A36.1060803@informatik.uni-hamburg.de> (raw)
In-Reply-To: <20151202154948.GA9525@sigill.intra.peff.net>

[-- Attachment #1: Type: text/plain, Size: 1528 bytes --]

Dear Peff,
I have no problem working around this bug/feature.

I just happen to think that the current *default* behaviour
is not the default behaviour that users have a right to expect:
I believe that users have every right to expect `git format-patch`/`git am`
to preserve commit messages perfectly by default.

Since I see that people are using the current behaviour as a feature,
I tried to come up with an alternative behaviour that would do both:

 1. Respect user assumptions to preserve commit messages by default.

 2. Allow users to prepend stuff when mailing a patch, that will get stripped automatically.

Just because the current behaviour is ... irritating.


Cheers,
Nathanael



On 12/02/2015 04:49 PM, Jeff King wrote:
> On Wed, Dec 02, 2015 at 01:38:18PM +0100, huebbe wrote:
> 
>> As such, I would like to ask whether it would be possible/sensible
>> to somehow escape square brackets, or mark the beginning
>> of the original commit message in the `git format-patch` output?
>> This would allow `git am` to reproduce the exact commit message by default
>> without breaking the "[]" convention.
> 
> I am not sure why "git format-patch -k | git am -k" does not do what you
> want. That is what those options were added for (and what git-rebase
> uses internally to make sure commit messages are left unmunged).
> 
> -Peff
> 


-- 
Please be aware that the enemies of your civil rights and your freedom
are on CC of all unencrypted communication. Protect yourself.


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

      reply	other threads:[~2015-12-03 10:32 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-25 15:29 Bug: Incorrect stripping of the [PATCH] prefix in git-am huebbe
2015-11-25 15:44 ` stefan.naewe
2015-11-25 15:59   ` huebbe
2015-12-02  0:58     ` Jeff King
2015-12-02  1:10       ` Stefan Beller
2015-12-02  2:27         ` Junio C Hamano
2015-12-02  2:24       ` Junio C Hamano
2015-12-02 12:38       ` huebbe
2015-12-02 15:49         ` Jeff King
2015-12-03 10:32           ` huebbe [this message]

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=56601A36.1060803@informatik.uni-hamburg.de \
    --to=nathanael.huebbe@informatik.uni-hamburg.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=peff@peff.net \
    --cc=sbeller@google.com \
    --cc=stefan.naewe@atlas-elektronik.com \
    /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.
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 NNTP newsgroup(s).