git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: subtle bug in git-am

From
Andy Shevchenko <andy.shevchenko@gmail.com>
Date
Apr 30, 2020, 14:26 UTC
Message-ID
<CAHp75VceVXMsTRAd9iW8D6-uqVR1Z6A9Crgsvyv_-KaSx7JR9Q@mail.gmail.com>
In-Reply-To
<CAHp75Vfuuth05wn-0x_AZa_LFSmQMHB6LGM5b4KNMoaxce1S-g@mail.gmail.com>

On Wed, Apr 8, 2020 at 12:29 PM Andy Shevchenko <andy.shevchenko@gmail.com> wrote:

> On Wed, Apr 8, 2020 at 4:19 AM brian m. carlson
> <sandals@crustytoothpaste.net> wrote:
> > On 2020-04-07 at 18:48:23, Andy Shevchenko wrote:
Show 28 quoted lines
> > > What I would like to do is to apply patch from one repository to another with
> > > same files but *different directory structure*.
> > >
> > > When I try to change directory in the target repo to the folder of files, I run
> > > git-am -p5 my_cool_patch.patch.
> > >
> > > Instead of the expected result (files and their contents is the same!) I got
> > > fileXXX is not in index.
> > >
> > > So, I think this is a bug, because -p<n> use in git-am makes little to no sense
> > > without above feature.
> >
> > So if I understand correctly, you're expecting git am to apply relative
> > to the current directory in the repository.  I have also expected that
> > behavior in the past, and found it surprising when it did not.
> >
> > What git am does is apply relative to the root of the repository.  If
> > you'd instead like to apply to a specific subdirectory of the
> > repository, you can use the --directory option to specify to which
> > directory your patch should apply.
> >
> > This is the behavior of git apply, which underpins git am.  However,
> > outside of a repository, it _does_ apply relative to the current
> > directory, since there's no repository root to consider.  I, at least,
> > found this confusing, but that's how it works.
>
> Thank you for the prompt reply with useful information. I will try it
> whenever I will need similar flow again.

Today I have needed something similar and I checked proposed w/a and it works! Thanks!

-- 
With Best Regards,
Andy Shevchenko
Previous: Andy Shevchenko
Message 4 of 4 in “subtle bug in git-am”
  1. Andy ShevchenkoApr 7, 2020
  2. brian m. carlsonApr 8, 2020
  3. Andy ShevchenkoApr 8, 2020
  4. Andy ShevchenkoApr 30, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.