From: Junio C Hamano <gitster@pobox.com>
To: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] git-am: indicate where a failed patch is to be found.
Date: Thu, 12 Jul 2012 10:45:22 -0700 [thread overview]
Message-ID: <7vhatcc1ql.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1342108243-8599-1-git-send-email-paul.gortmaker@windriver.com> (Paul Gortmaker's message of "Thu, 12 Jul 2012 11:50:43 -0400")
Paul Gortmaker <paul.gortmaker@windriver.com> writes:
> If git am wasn't run with --reject, we assume the end user
> knows where to find the patch. This is normally true for
> a single patch,
Not at all. Whether it is a single or broken, the patch is fed to
underlying "apply" from an unadvertised place.
> So, provide a helpful hint as to where they can
> find the patch ...
This is OK, but you may want to give a way to squelch it once the
user learns where it is by following the usual "advice.*" thing.
> ... to do the manual fixup before eventually
> continuing with "git add ... ; git am -r".
This is _NOT_ fine, especially if you suggest "patch" the user may
not have, and more importantly does not have a clue why "git apply"
rejected it ("am" does _not_ use "patch" at all).
next prev parent reply other threads:[~2012-07-12 17:45 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 [this message]
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 ` [PATCH] " Nicolas Sebrecht
2012-07-12 21:55 ` 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=7vhatcc1ql.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--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).