# am: be more helpful 3 messages from 2010-04-09 to 2010-04-09. Participants: Sverre Rabbelier, Junio C Hamano. Thread: https://gitlist.dev/t/23402 ## Sverre Rabbelier, 2010-04-09 22:59 Subject: am: be more helpful Message-ID: URL: https://gitlist.dev/e/t2kfabb9a1e1004091559u92230e17h957f2c5565c133e3%40mail.gmail.com ``` 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 ``` ## Junio C Hamano, 2010-04-09 23:27 Subject: Re: am: be more helpful Message-ID: <7v4ojk1a1i.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7v4ojk1a1i.fsf%40alter.siamese.dyndns.org In-Reply-To: ``` Sverre Rabbelier 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"? ``` ## Sverre Rabbelier, 2010-04-09 23:31 Subject: Re: am: be more helpful Message-ID: URL: https://gitlist.dev/e/j2yfabb9a1e1004091631v40226a94kbad5512e9439c65d%40mail.gmail.com In-Reply-To: <7v4ojk1a1i.fsf@alter.siamese.dyndns.org> ``` Heya, On Sat, Apr 10, 2010 at 01:27, Junio C Hamano wrote: > Sverre Rabbelier 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 ```