From: Han Young <hanyang.tony@bytedance.com>
To: git@vger.kernel.org
Cc: Han Young <hanyang.tony@bytedance.com>
Subject: [PATCH 1/1] quote: quote space
Date: Tue, 19 Mar 2024 17:52:12 +0800 [thread overview]
Message-ID: <20240319095212.42332-2-hanyang.tony@bytedance.com> (raw)
In-Reply-To: <20240319095212.42332-1-hanyang.tony@bytedance.com>
`git_header_name()` in apply.c uses space as separator between the preimage and postimage pathname, filename with space in them normally won't cause apply to fail because `git_header_name()` isn't using simple split. However, if the pathname has a directory whose name ending with space will lead to `skip_tree_prefix()` mistake the path as an absolute path, and git am fails with
error: git diff header lacks filename information when removing 1 leading pathname component
The simplest fix to this edge case is to quote every path with space, even if the space is not at directory name end.
---
quote.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/quote.c b/quote.c
index 3c05194496..ecbbaed061 100644
--- a/quote.c
+++ b/quote.c
@@ -222,7 +222,7 @@ static signed char const cq_lookup[256] = {
/* 0x00 */ 1, 1, 1, 1, 1, 1, 1, 'a',
/* 0x08 */ 'b', 't', 'n', 'v', 'f', 'r', 1, 1,
/* 0x10 */ X16(1),
- /* 0x20 */ -1, -1, '"', -1, -1, -1, -1, -1,
+ /* 0x20 */ 1, -1, '"', -1, -1, -1, -1, -1,
/* 0x28 */ X16(-1), X16(-1), X16(-1),
/* 0x58 */ -1, -1, -1, -1,'\\', -1, -1, -1,
/* 0x60 */ X16(-1), X8(-1),
--
2.44.0
next prev parent reply other threads:[~2024-03-19 9:52 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-19 9:52 [PATCH 0/1] quote: quote space Han Young
2024-03-19 9:52 ` Han Young [this message]
2024-03-19 9:59 ` [PATCH 1/1] " Kristoffer Haugsbakk
2024-03-19 15:15 ` [PATCH 0/1] " Junio C Hamano
2024-03-19 22:56 ` Junio C Hamano
2024-03-26 21:41 ` Junio C Hamano
2024-03-27 9:17 ` Jeff King
2024-03-27 14:59 ` Junio C Hamano
2024-03-27 22:11 ` Junio C Hamano
2024-03-28 10:32 ` Jeff King
2024-03-28 11:40 ` Jeff King
2024-03-28 17:05 ` Eric Sunshine
2024-03-28 17:31 ` Junio C Hamano
2024-03-28 21:08 ` [PATCH v2] t4126: make sure a directory with SP at the end is usable Junio C Hamano
2024-03-29 2:18 ` Junio C Hamano
2024-03-29 5:37 ` [PATCH] t4126: fix "funny directory name" test on Windows (again) Junio C Hamano
2024-03-29 12:00 ` Jeff King
2024-03-29 17:21 ` [PATCH v2] " Junio C Hamano
2024-03-29 18:34 ` Jeff King
2024-03-29 11:27 ` [PATCH v2] t4126: make sure a directory with SP at the end is usable Jeff King
2024-03-29 17:01 ` Junio C Hamano
2024-04-27 14:47 ` Johannes Schindelin
2024-04-27 17:20 ` Junio C Hamano
2024-03-28 16:19 ` [PATCH 0/1] quote: quote space Junio C Hamano
2024-03-28 16:30 ` Jeff King
2024-03-28 16:53 ` Junio C Hamano
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=20240319095212.42332-2-hanyang.tony@bytedance.com \
--to=hanyang.tony@bytedance.com \
--cc=git@vger.kernel.org \
/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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).