From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH 4/6] wt-status: consistently quote paths in "status --short" output
Date: Tue, 8 Sep 2020 13:52:22 -0700 [thread overview]
Message-ID: <20200908205224.4126551-5-gitster@pobox.com> (raw)
In-Reply-To: <20200908205224.4126551-1-gitster@pobox.com>
Tracked paths with SP in them were c-quoted in "git status --short"
output, but untracked, ignored, and unmerged paths weren't. Treat
them the same way for consistency.
The test was stolen from a patch to fix output for the 'untracked'
paths by brian m. carlson.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
t/t7508-status.sh | 21 +++++++++++++++++++++
wt-status.c | 4 ++--
2 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index e81759319f..ef8d19c151 100755
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -814,6 +814,27 @@ test_expect_success 'status -s without relative paths' '
'
+cat >expect <<\EOF
+ M dir1/modified
+A dir2/added
+A "file with spaces"
+?? dir1/untracked
+?? dir2/modified
+?? dir2/untracked
+?? "file with spaces 2"
+?? untracked
+EOF
+
+test_expect_success 'status -s without relative paths' '
+ test_when_finished "git rm --cached \"file with spaces\"; rm -f file*" &&
+ >"file with spaces" &&
+ >"file with spaces 2" &&
+ git add "file with spaces" &&
+ git status -s >output &&
+ test_cmp expect output
+
+'
+
test_expect_success 'dry-run of partial commit excluding new file in index' '
cat >expect <<EOF &&
On branch master
diff --git a/wt-status.c b/wt-status.c
index adbf6958bd..7139623025 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -1848,7 +1848,7 @@ static void wt_shortstatus_unmerged(struct string_list_item *it,
} else {
struct strbuf onebuf = STRBUF_INIT;
const char *one;
- one = quote_path(it->string, s->prefix, &onebuf, 0);
+ one = quote_path(it->string, s->prefix, &onebuf, QUOTE_PATH_QUOTE_SP);
printf(" %s\n", one);
strbuf_release(&onebuf);
}
@@ -1896,7 +1896,7 @@ static void wt_shortstatus_other(struct string_list_item *it,
} else {
struct strbuf onebuf = STRBUF_INIT;
const char *one;
- one = quote_path(it->string, s->prefix, &onebuf, 0);
+ one = quote_path(it->string, s->prefix, &onebuf, QUOTE_PATH_QUOTE_SP);
color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
printf(" %s\n", one);
strbuf_release(&onebuf);
--
2.28.0-539-g66371d8995
next prev parent reply other threads:[~2020-09-08 20:52 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-08 0:28 [Bug report] git status doesn't escape paths of untracked files Patrick Fong
2020-09-08 1:13 ` Junio C Hamano
2020-09-08 1:17 ` brian m. carlson
2020-09-08 1:30 ` Junio C Hamano
2020-09-08 4:41 ` Junio C Hamano
2020-09-08 17:39 ` Junio C Hamano
2020-09-08 19:01 ` Martin Ågren
2020-09-08 21:06 ` René Scharfe
2020-09-09 22:22 ` Junio C Hamano
2020-09-10 14:23 ` René Scharfe
2020-09-10 15:28 ` Junio C Hamano
2020-09-08 1:30 ` [PATCH] wt-status: quote paths identically whether tracked or untracked brian m. carlson
2020-09-08 20:52 ` [PATCH 0/6] quote_path() clean-ups Junio C Hamano
2020-09-08 20:52 ` [PATCH 1/6] quote_path: rename quote_path_relative() to quote_path() Junio C Hamano
2020-09-08 20:52 ` [PATCH 2/6] quote_path: give flags parameter " Junio C Hamano
2020-09-10 12:21 ` Jeff King
2020-09-10 15:04 ` Junio C Hamano
2020-09-10 15:17 ` Junio C Hamano
2020-09-10 20:26 ` Jeff King
2020-09-08 20:52 ` [PATCH 3/6] quote_path: optionally allow quoting a path with SP in it Junio C Hamano
2020-09-10 12:35 ` Jeff King
2020-09-08 20:52 ` Junio C Hamano [this message]
2020-09-08 20:52 ` [PATCH 5/6] quote: rename misnamed sq_lookup[] to cq_lookup[] Junio C Hamano
2020-09-08 20:52 ` [PATCH 6/6] quote: turn 'nodq' parameter into a set of flags Junio C Hamano
2020-09-10 12:38 ` Jeff King
2020-09-08 22:56 ` [PATCH 0/6] quote_path() clean-ups Chris Torek
2020-09-10 12:39 ` Jeff King
2020-09-10 17:01 ` [PATCH v2 0/7] " Junio C Hamano
2020-09-10 17:01 ` [PATCH v2 1/7] quote_path: rename quote_path_relative() to quote_path() Junio C Hamano
2020-09-10 17:01 ` [PATCH v2 2/7] quote_path: give flags parameter " Junio C Hamano
2020-09-10 17:01 ` [PATCH v2 3/7] quote_path: optionally allow quoting a path with SP in it Junio C Hamano
2020-09-10 17:01 ` [PATCH v2 4/7] quote_path: code clarification Junio C Hamano
2020-09-10 18:08 ` Jeff King
2020-09-10 18:40 ` Junio C Hamano
2020-09-10 19:29 ` Jeff King
2020-09-10 17:01 ` [PATCH v2 5/7] wt-status: consistently quote paths in "status --short" output Junio C Hamano
2020-09-10 18:13 ` Jeff King
2020-09-10 18:38 ` Junio C Hamano
2020-09-10 17:01 ` [PATCH v2 6/7] quote: rename misnamed sq_lookup[] to cq_lookup[] Junio C Hamano
2020-09-10 17:01 ` [PATCH v2 7/7] quote: turn 'nodq' parameter into a set of flags Junio C Hamano
2020-09-10 23:03 ` [PATCH v2 0/7] quote_path() clean-ups brian m. carlson
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=20200908205224.4126551-5-gitster@pobox.com \
--to=gitster@pobox.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 NNTP newsgroup(s).