git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Joe Perches <joe@perches.com>
Cc: git <git@vger.kernel.org>, David Miller <davem@davemloft.net>
Subject: Re: bug?  git format-patch -M -D then git am fails
Date: Tue, 13 Nov 2012 14:55:09 -0800	[thread overview]
Message-ID: <7vsj8dcdv6.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1352846721.17444.24.camel@joe-AO722> (Joe Perches's message of "Tue, 13 Nov 2012 14:45:21 -0800")

Joe Perches <joe@perches.com> writes:

> (Sorry about the partial message.
>  evolution and ctrl-enter sends, grumble...)
>
> If a file is deleted with git rm and a patch
> is then generated with git format-patch -M -D
> git am is unable to apply the resultant patch.
>
> Is this working as designed?

I would say it is broken as designed and it is even documented.

Please run "git format-patch --help | less" and then type
"/--irreversible-delete" to find:

    The resulting patch is not meant to be applied with patch nor
    git apply; this is solely for people who want to just
    concentrate on reviewing the text after the change.

  reply	other threads:[~2012-11-13 22:55 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-13 22:45 bug? git format-patch -M -D then git am fails Joe Perches
2012-11-13 22:55 ` Junio C Hamano [this message]
2012-11-13 23:06   ` Joe Perches
2012-11-13 23:22     ` Junio C Hamano
2012-11-14 13:28       ` Michael J Gruber
  -- strict thread matches above, loose matches on Subject: below --
2012-11-13 22:41 Joe Perches

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=7vsj8dcdv6.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=davem@davemloft.net \
    --cc=git@vger.kernel.org \
    --cc=joe@perches.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).