From patchwork Tue Sep 8 01:30:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "brian m. carlson" X-Patchwork-Id: 11762421 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8C4B259D for ; Tue, 8 Sep 2020 01:30:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7A905206B8 for ; Tue, 8 Sep 2020 01:30:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728350AbgIHBay (ORCPT ); Mon, 7 Sep 2020 21:30:54 -0400 Received: from injection.crustytoothpaste.net ([192.241.140.119]:55460 "EHLO injection.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728195AbgIHBas (ORCPT ); Mon, 7 Sep 2020 21:30:48 -0400 Received: from camp.crustytoothpaste.net (unknown [IPv6:2001:470:b978:101:b610:a2f0:36c1:12e3]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by injection.crustytoothpaste.net (Postfix) with ESMTPSA id 11D1E60457; Tue, 8 Sep 2020 01:30:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=crustytoothpaste.net; s=default; t=1599528645; bh=sXtv5MLPF/kaeySYURdayPU+cXTbd0fbqr/7NvSOS8A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Reply-To: Subject:Date:To:CC:Resent-Date:Resent-From:Resent-To:Resent-Cc: In-Reply-To:References:Content-Type:Content-Disposition; b=VBxfSpRWQwuvFv8y5Qb74XH3Xhg6ioqA9Uw+Qp+Md5uxbbFOYC0iqCfe8bOcl/Zjp mjac4BDG53S3YUhrNiSL1bzsutjRceSROCiZWY3Hfp+KXy8GivDLoUBSS9PavWSzAD Y9tKfwfUZgDvu+UIn4006KlnltmhTYFjbL/B9PGnZ/OIxWZRRdHGSetqjqp5mzpOzI KlvVQ4JjIMFSrGzKnS3mlzKrexyHD+vlkz9YE3qKhjI5Wa2ybIAK0mL1PB3449NnGC Z6hS4zXI/6p2BCAvEzXpkpPYefI2kp9nHBvv61MA3eNhg9rIGgT7MuKvDXCH/4elWw EhcGmkoJb4sx+msYX+eZWst/eyw0PaK8fpaXRQVzuHpr8m6G0bIiZEDk6Uclp58np4 gl0EoKmlTvmzU3eZXLPyTSLhF3yrjOitGTH7E4IbNrWqH/ryPzMviIpOj/k4jmxf4K ub2tZ3xNnl/CFxSRCNrlTbbq+6IARoy3SNyDrZK/82enagS++MH From: "brian m. carlson" To: Cc: Patrick Fong Subject: [PATCH] wt-status: quote paths identically whether tracked or untracked Date: Tue, 8 Sep 2020 01:30:13 +0000 Message-Id: <20200908013013.1099937-1-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.28.0.297.g1956fa8f8d In-Reply-To: References: MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The documentation for git status --short says this: If a filename contains whitespace or other nonprintable characters, that field will be quoted in the manner of a C string literal: surrounded by ASCII double quote (34) characters, and with interior special characters backslash-escaped. Note that this differs from our typical quoting rule, which does not include spaces. If we did not quote spaces, our output would be ambiguous for renames. However, we failed to do this correctly for untracked files. If we list an untracked file that contains spaces, we fail to quote it. Since this is both inconsistent and not what was documented, let's fix it by quoting untracked files in the same way as tracked files. Users parsing this output already need to handle quoted names for tracked files (or use -z) so this shouldn't be an incompatible change. Note that the test for this case should be portable because all known modern systems support spaces in file names and our test trash directories use them already. Reported-by: Patrick Fong Signed-off-by: brian m. carlson --- t/t7508-status.sh | 21 +++++++++++++++++++++ wt-status.c | 8 +++++++- 2 files changed, 28 insertions(+), 1 deletion(-) 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 <string, s->prefix, &onebuf); color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign); - printf(" %s\n", one); + putchar(' '); + if (*one != '"' && strchr(one, ' ') != NULL) { + putchar('"'); + strbuf_addch(&onebuf, '"'); + one = onebuf.buf; + } + printf("%s\n", one); strbuf_release(&onebuf); } }