From: "Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail.com>
To: "Alejandro Colomar" <alx@kernel.org>,
git@vger.kernel.org, наб <nabijaczleweli@nabijaczleweli.xyz>
Cc: linux-man@vger.kernel.org, "Jeff King" <peff@peff.net>
Subject: Re: [PATCH v2] futex_waitv.2: new page
Date: Tue, 10 Feb 2026 16:54:02 +0100 [thread overview]
Message-ID: <55bd6ad3-cd19-4839-a808-eceae802d3c8@app.fastmail.com> (raw)
In-Reply-To: <aYtAknObJpjszCaj@devuan>
On Tue, Feb 10, 2026, at 15:30, Alejandro Colomar wrote:
> Hi!
>
> On 2026-02-10T15:17:55+0100, наб wrote:
>> Hi!
>>
>> On Mon, Feb 09, 2026 at 11:35:53PM +0100, Alejandro Colomar wrote:
>> > On 2026-02-07T23:00:49+0100, наб wrote:
>> > > Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
>> >
>> > For some reason, the patch doesn't want to apply. I don't see anything
>> > obviously wrong, so it may be an issue in my side?
>> >
>> > Applying: futex_waitv.2: new page
>> > error: affected file 'man2/futex_waitv.2' is beyond a symbolic link
>> > error: man7/futex.7: does not exist in index
>> > Patch failed at 0001 futex_waitv.2: new page
>> > hint: Use 'git am --show-current-patch=diff' to see the failed patch
>> > hint: When you have resolved this problem, run "git am --continue".
>> > hint: If you prefer to skip this patch, run "git am --skip" instead.
>> > hint: To restore the original branch and stop patching, run "git am --abort".
>> > hint: Disable this message with "git config set advice.mergeConflict false"
>> > Press any key to continue...
>>
>> Hm, I did recently set
>> $ git config diff.noprefix
>> true
>> I didn't expect this to affect format-patch diffs
>> (since it doesn't affect diffs shown by git add -p),
>> or, if it did, I expected the designated consumer of format-patch
>> diffs (am) to understand this. perhaps not;
>> maybe -p0 to git am?
>>
>> A quick search yields
>> https://lore.kernel.org/git/xmqqy1o5op1i.fsf@gitster.g/t/#eaa0323ec4eed441b37caf96e1b136529b298dbac
>> where you're in the thread and the maintainer says "queued" for a patch
>> that would ignore noprefix for format-patch for this reason precisely.
>> But clearly not, since my patches were with noprefix=true and came out -p0.
>
> Oh, that bites again!
>
> Junio, do you still have this queued?
> <https://lore.kernel.org/git/xmqqy1o5op1i.fsf@gitster.g/t/#m6f42ff4f0cb2d6dd1d68f12a533d04c822b68a80>
See 15108de2 (Merge branch 'jk/format-patch-ignore-noprefix',
2023-03-21).
An aside but `format.noprefix` is not a boolean like `diff.noprefix`.
It will be enabled with any value.
Is it standard to indicate this with the existing “If set,”, perhaps? Or
should it say “enabled with any value”?
(+Cc Peff)
format.noprefix::
If set, do not show any source or destination prefix in patches.
This is equivalent to the `diff.noprefix` option used by `git
diff` (but which is not respected by `format-patch`). Note that
by setting this, the receiver of any patches you generate will
have to apply them using the `-p0` option.
next prev parent reply other threads:[~2026-02-10 15:54 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <jpyv367v4jdxfxebxw6wh7rgqdfeswzp44dzsycfjt5k2pxe4j@tarta.nabijaczleweli.xyz>
[not found] ` <se6hm5gnd7cyjsby5q6pctkrws5ecp5gpnfjuy3zh2shd2abyj@tarta.nabijaczleweli.xyz>
[not found] ` <aYpg1XelZBzpw4ZL@devuan>
[not found] ` <rqshygydxwpfs2mi5cwxl3wvztgctj3nvu3y5bpo5s32owucna@tarta.nabijaczleweli.xyz>
2026-02-10 14:30 ` [PATCH v2] futex_waitv.2: new page Alejandro Colomar
2026-02-10 15:54 ` Kristoffer Haugsbakk [this message]
2026-02-10 18:39 ` Alejandro Colomar
2026-02-11 7:35 ` Jeff King
2026-02-11 8:15 ` Kristoffer Haugsbakk
2026-02-11 15:43 ` Junio C Hamano
2026-02-10 16:54 ` Junio C Hamano
2026-02-10 17:11 ` Kristoffer Haugsbakk
2026-02-10 18:44 ` Alejandro Colomar
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=55bd6ad3-cd19-4839-a808-eceae802d3c8@app.fastmail.com \
--to=kristofferhaugsbakk@fastmail.com \
--cc=alx@kernel.org \
--cc=git@vger.kernel.org \
--cc=linux-man@vger.kernel.org \
--cc=nabijaczleweli@nabijaczleweli.xyz \
--cc=peff@peff.net \
/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