Re: Error in posix_spawn(3) man page
Corinna Vinschen <[email protected]>
| Newsgroups | gmane.comp.lib.newlib |
|---|---|
| Message-ID | <[email protected]> |
On Jan 7 20:30, Keith Thompson wrote: > On Fri, Jan 7, 2022 at 4:01 PM Keith Thompson > <[email protected]> wrote: > > The problem was that I had diff.noprefix=true in my $HOME/.gitconfig. > > It caused `git format-patch` to omit the `a/` and `b/` prefixes, and `git am` > > doesn't appear to have any way to consume a patch with those prefixes missing. > > > > I've attached an updated patch that should apply cleanly. > > > > (I'd argue that this is a git bug, but of course this isn't the place > > to report it.) > > I submitted a Git bug report. The response: > ] The -p<num> flag controls how many segments `git am` or `git apply` > ] removes. The default is -p1. `git am -p0` should apply the patch > ] correctly. > > The "-p<n>" option to "git am" is mentioned in the git-am(1) man page, > but explained only by reference to git-apply(1), so it's easy to miss > (I certainly did). > > My original patch could have been applied with `git am -p0`. I hope > this is useful if you receive any future patches with the same issue. D'oh, thanks! I pushed your patch. Corinna