diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-09-10 20:01:55 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-09-10 20:49:20 +0300 |
commit | f3fc4a1b8680c114defd98ce6f2429f8946a5dc1 (patch) | |
tree | 4d40269465613f8ae72d3029a43234c9dbeed2a4 /wt-status.c | |
parent | 88910c9939cee927a3ed1acca8d33a30c90b8fe5 (diff) |
quote_path: optionally allow quoting a path with SP in it
Some code in wt-status.c special case a path with SP in it, which
usually does not have to be c-quoted, and ensure that such a path
does get quoted. Move the logic to quote_path() and give it a bit
in the flags word, QUOTE_PATH_QUOTE_SP.
No behaviour change intended.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'wt-status.c')
-rw-r--r-- | wt-status.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/wt-status.c b/wt-status.c index d6ca7bd52c..adbf6958bd 100644 --- a/wt-status.c +++ b/wt-status.c @@ -1877,21 +1877,12 @@ static void wt_shortstatus_status(struct string_list_item *it, const char *one; if (d->rename_source) { - one = quote_path(d->rename_source, s->prefix, &onebuf, 0); - if (*one != '"' && strchr(one, ' ') != NULL) { - putchar('"'); - strbuf_addch(&onebuf, '"'); - one = onebuf.buf; - } + one = quote_path(d->rename_source, s->prefix, &onebuf, + QUOTE_PATH_QUOTE_SP); printf("%s -> ", one); strbuf_release(&onebuf); } - one = quote_path(it->string, s->prefix, &onebuf, 0); - if (*one != '"' && strchr(one, ' ') != NULL) { - putchar('"'); - strbuf_addch(&onebuf, '"'); - one = onebuf.buf; - } + one = quote_path(it->string, s->prefix, &onebuf, QUOTE_PATH_QUOTE_SP); printf("%s\n", one); strbuf_release(&onebuf); } |