From: Nicolas Sebrecht <nicolas.s.dev@gmx.fr>
To: Junio C Hamano <gitster@pobox.com>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>,
git@vger.kernel.org, Nicolas Sebrecht <nicolas.s.dev@gmx.fr>
Subject: [PATCH] Re: git-am: indicate where a failed patch is to be found.
Date: Thu, 12 Jul 2012 23:18:35 +0200 [thread overview]
Message-ID: <20120712211835.GA858@vidovic> (raw)
In-Reply-To: <7va9z4byl3.fsf@alter.siamese.dyndns.org>
The 12/07/12, Junio C Hamano wrote:
> It does not matter at all that 0001-foo.patch only has a single
> patch. If you are going to fix up the patch after you saw "git am"
> failed, you will be fixing .git/rebase-apply/patch with your editor
> and re-run "git am" without arguments, at which point "git am" will
> not look at your 0001-foo.patch file at all.
Hugh! Didn't know that.
Is it actually expected from users to manually edit
.git/rebase-apply/patch path? I can't find any reference about that in
the documentation and it really sounds like interfering with the git
internals.
Shouldn't git-am/git-rebase expose this to the user (I'm thinking about
something like
git am --edit-offending-patch
git am --fix-patch
)?
--
Nicolas Sebrecht
next prev parent reply other threads:[~2012-07-12 21:18 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-12 15:50 [PATCH] git-am: indicate where a failed patch is to be found Paul Gortmaker
2012-07-12 17:45 ` Junio C Hamano
2012-07-12 18:32 ` Paul Gortmaker
2012-07-12 18:53 ` Junio C Hamano
2012-07-12 19:36 ` Paul Gortmaker
2012-07-12 20:00 ` Junio C Hamano
2012-07-13 17:40 ` Paul Gortmaker
2012-07-13 18:06 ` Junio C Hamano
2012-07-12 21:07 ` Junio C Hamano
2012-07-13 15:51 ` [PATCH v2] " Paul Gortmaker
2012-07-13 19:58 ` Junio C Hamano
2012-07-13 22:46 ` Paul Gortmaker
2012-07-13 23:02 ` Junio C Hamano
2012-07-12 21:18 ` Nicolas Sebrecht [this message]
2012-07-12 21:55 ` [PATCH] " Junio C Hamano
2012-07-12 20:33 ` [PATCH] " Jeff King
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=20120712211835.GA858@vidovic \
--to=nicolas.s.dev@gmx.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=paul.gortmaker@windriver.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).