Re: [PATCH] fast-export: quote paths with spaces
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:54:10
Possibly related (same subject, not in this thread)
- 2016-06-15 · [PATCH] fast-export: quote paths with spaces · Jay Soffian <hidden>
Jay Soffian [off-list ref] writes:
A path containing a space must be quoted when used as an argument to either the copy or rename commands. 6280dfdc3b (fast-export: quote paths in output, 2011-08-05) previously attempted to fix fast-export's quoting by passing all paths through quote_c_style(). However, that function does not consider the space to be a character which requires quoting, so let's special-case the space inside print_path(). This will cause space-containing paths to also be quoted in other commands where such quoting is not strictly necessary, but it does not hurt to do so. Signed-off-by: Jay Soffian <redacted> --- Sorry, not test added. I barely had time to get out this patch. :-(
Thanks. I have to say it might be less error prone to always c-quote the string, as the recipient is expected to be able to grok it anyway, but I'll let fast-import/export experts to comment on it and perhaps add a test or two ;-)
quoted hunk
builtin/fast-export.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)diff --git a/builtin/fast-export.c b/builtin/fast-export.c index ef7c012094..cc5ef82fe6 100644 --- a/builtin/fast-export.c +++ b/builtin/fast-export.c@@ -183,9 +183,11 @@ static int depth_first(const void *a_, const void *b_) static void print_path(const char *path) { int need_quote = quote_c_style(path, NULL, NULL, 0); - if (need_quote) + if (need_quote) { quote_c_style(path, NULL, stdout, 0); - else + } else if (strchr(path, ' ')) { + printf("\"%s\"", path); + } else printf("%s", path); }