зеркало из https://github.com/microsoft/git.git
status: Quote paths with spaces in short format
According to the documentation for git-status, in short-format mode,
paths with spaces or unprintable characters are quoted. However
28fba29
(Do not quote SP., 2005-10-17) removed the behavior that quotes
paths that have spaces but not unprintable characters. Unfortunately this
makes the output of `git status --porcelain` non-parseable in certain
(rather unusual) edge cases. In the interest of removing ambiguity when
parsing the output of `git status --porcelain`, restore the behavior of
quoting paths with spaces in git-status's short-format mode.
Signed-off-by: Kevin Ballard <kevin@sb.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
af77aee9ca
Коммит
dbfdc625a5
10
wt-status.c
10
wt-status.c
|
@ -744,10 +744,20 @@ static void wt_shortstatus_status(int null_termination, struct string_list_item
|
||||||
const char *one;
|
const char *one;
|
||||||
if (d->head_path) {
|
if (d->head_path) {
|
||||||
one = quote_path(d->head_path, -1, &onebuf, s->prefix);
|
one = quote_path(d->head_path, -1, &onebuf, s->prefix);
|
||||||
|
if (*one != '"' && strchr(one, ' ') != NULL) {
|
||||||
|
putchar('"');
|
||||||
|
strbuf_addch(&onebuf, '"');
|
||||||
|
one = onebuf.buf;
|
||||||
|
}
|
||||||
printf("%s -> ", one);
|
printf("%s -> ", one);
|
||||||
strbuf_release(&onebuf);
|
strbuf_release(&onebuf);
|
||||||
}
|
}
|
||||||
one = quote_path(it->string, -1, &onebuf, s->prefix);
|
one = quote_path(it->string, -1, &onebuf, s->prefix);
|
||||||
|
if (*one != '"' && strchr(one, ' ') != NULL) {
|
||||||
|
putchar('"');
|
||||||
|
strbuf_addch(&onebuf, '"');
|
||||||
|
one = onebuf.buf;
|
||||||
|
}
|
||||||
printf("%s\n", one);
|
printf("%s\n", one);
|
||||||
strbuf_release(&onebuf);
|
strbuf_release(&onebuf);
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче