* am: be more helpful
@ 2010-04-09 22:59 Sverre Rabbelier
2010-04-09 23:27 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: Sverre Rabbelier @ 2010-04-09 22:59 UTC (permalink / raw)
To: Git List
Heya,
I run into this problem every now and then when I manually apply a
patch. I apply it, do some stuff, and then having forgotten I already
applied it, try to apply it again, and am confused as to why it won't
apply. Would it be difficult to teach 'git am' to see if the patch-id
of the patch that couldn't be applied has been applied already
(similar to what 'git cherry' does I guess?) and print a helpful
message saying "warning: patch already applied" when there is a
conflict trying to apply such an already-applied patch?
--
Cheers,
Sverre Rabbelier
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: am: be more helpful
2010-04-09 22:59 am: be more helpful Sverre Rabbelier
@ 2010-04-09 23:27 ` Junio C Hamano
2010-04-09 23:31 ` Sverre Rabbelier
0 siblings, 1 reply; 3+ messages in thread
From: Junio C Hamano @ 2010-04-09 23:27 UTC (permalink / raw)
To: Sverre Rabbelier; +Cc: Git List
Sverre Rabbelier <srabbelier@gmail.com> writes:
> Heya,
>
> I run into this problem every now and then when I manually apply a
> patch. I apply it, do some stuff, and then having forgotten I already
> applied it, try to apply it again, and am confused as to why it won't
> apply. Would it be difficult to teach 'git am' to see if the patch-id
> of the patch that couldn't be applied has been applied already
> (similar to what 'git cherry' does I guess?) and print a helpful
> message saying "warning: patch already applied" when there is a
> conflict trying to apply such an already-applied patch?
"am -3"?
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: am: be more helpful
2010-04-09 23:27 ` Junio C Hamano
@ 2010-04-09 23:31 ` Sverre Rabbelier
0 siblings, 0 replies; 3+ messages in thread
From: Sverre Rabbelier @ 2010-04-09 23:31 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Git List
Heya,
On Sat, Apr 10, 2010 at 01:27, Junio C Hamano <gitster@pobox.com> wrote:
> Sverre Rabbelier <srabbelier@gmail.com> writes:
>> I run into this problem every now and then when I manually apply a
>> patch. I apply it, do some stuff, and then having forgotten I already
>> applied it, try to apply it again, and am confused as to why it won't
>> apply. Would it be difficult to teach 'git am' to see if the patch-id
>> of the patch that couldn't be applied has been applied already
>> (similar to what 'git cherry' does I guess?) and print a helpful
>> message saying "warning: patch already applied" when there is a
>> conflict trying to apply such an already-applied patch?
>
> "am -3"?
"Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
No changes -- Patch already applied."
Yeah, that's pretty much what I want, only I'd like to get that as a
warning when running 'git am' without the -3. Either that, or have -3
be the default, which we all know won't happen :P. If I'd realize that
perhaps I'd already applied the patch I could indeed use 'git am -3'
to check that, or, as I do now (after a few minutes of confusion),
scroll up and notice that I'd already applied it. What I want is to
save me those minutes of confusion by having git DWIW.
--
Cheers,
Sverre Rabbelier
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-04-09 23:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-09 22:59 am: be more helpful Sverre Rabbelier
2010-04-09 23:27 ` Junio C Hamano
2010-04-09 23:31 ` Sverre Rabbelier
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).