From: Junio C Hamano <gitster@pobox.com>
To: Emily Xie <emilyxxie@gmail.com>
Cc: git@vger.kernel.org, novalis@novalis.org
Subject: Re: [PATCH] pathspec: die on empty strings as pathspec
Date: Sat, 10 Jun 2017 01:28:54 +0900 [thread overview]
Message-ID: <xmqq60g56s6x.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170607033308.33550-1-emilyxxie@gmail.com> (Emily Xie's message of "Tue, 6 Jun 2017 23:33:08 -0400")
Emily Xie <emilyxxie@gmail.com> writes:
> An empty string as a pathspec element matches all paths. A buggy
> script, however, could accidentally assign an empty string to a
> variable that then gets passed to a Git command invocation, e.g.:
>
> path=... compute a path to be removed in $path ...
> git rm -r "$path"
>
> which would unintentionally remove all paths in the current
> directory.
>
> The fix for this issue comprises of two steps. Step 1, which warns
> that empty strings as pathspecs will become invalid, has already
> been implemented in commit d426430 ("pathspec: warn on empty strings
> as pathspec", 2016-06-22).
>
> This patch is step 2. It removes the warning and throws an error
> instead.
>
> Signed-off-by: Emily Xie <emilyxxie@gmail.com>
> Reported-by: David Turner <novalis@novalis.org>
> ---
We started this at v2.11.0 at the end of November 2016, and this
cycle is expected to complete at around the end of July 2017, so
this patch makes it a 8-month deprecation cycle. I think that it
should be long enough.
Thanks.
> diff --git a/pathspec.c b/pathspec.c
> index 50f76ff..65e18b1 100644
> --- a/pathspec.c
> +++ b/pathspec.c
> @@ -638,12 +638,10 @@ void parse_pathspec(struct pathspec *pathspec,
> }
>
> n = 0;
> - warn_empty_string = 1;
> while (argv[n]) {
> - if (*argv[n] == '\0' && warn_empty_string) {
> - warning(_("empty strings as pathspecs will be made invalid in upcoming releases. "
> - "please use . instead if you meant to match all paths"));
> - warn_empty_string = 0;
> + if (*argv[n] == '\0') {
> + die("empty string is not a valid pathspec. "
> + "please use . instead if you meant to match all paths");
> }
> n++;
> }
The {} around a single statement becomes unnecessary, so I'll remove
them while queuing.
next prev parent reply other threads:[~2017-06-09 16:28 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-07 3:33 [PATCH] pathspec: die on empty strings as pathspec Emily Xie
2017-06-09 16:28 ` Junio C Hamano [this message]
2017-06-10 6:21 ` Jeff King
2017-06-10 11:03 ` Junio C Hamano
2017-06-09 16:50 ` Brandon Williams
2017-06-10 5:54 ` Junio C Hamano
2017-06-23 2:34 ` Emily Xie
2017-06-23 4:09 ` Junio C Hamano
2017-06-23 4:46 ` Junio C Hamano
2017-06-23 18:04 ` Junio C Hamano
2017-06-23 20:52 ` Torsten Bögershausen
2017-06-23 20:59 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq60g56s6x.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=emilyxxie@gmail.com \
--cc=git@vger.kernel.org \
--cc=novalis@novalis.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).