pathspec: die on empty strings as pathspec

emilyxxie · gitster · commit 9e4e8a64c2b9 · 2017-06-23T13:10:35.000-07:00
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/pathspec.c b/pathspec.c
@@ -364,7 +364,7 @@ void parse_pathspec(struct pathspec *pathspec,
 {
 	struct pathspec_item *item;
 	const char *entry = argv ? *argv : NULL;
-	int i, n, prefixlen, warn_empty_string, nr_exclude = 0;
+	int i, n, prefixlen, nr_exclude = 0;
 
 	memset(pathspec, 0, sizeof(*pathspec));
 
@@ -402,13 +402,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++;
 	}
 
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
@@ -881,9 +881,8 @@ test_expect_success 'rm files with two different errors' '
 	test_i18ncmp expect actual
 '
 
-test_expect_success 'rm empty string should invoke warning' '
-	git rm -rf "" 2>output &&
-	test_i18ngrep "warning: empty strings" output
+test_expect_success 'rm empty string should fail' '
+	test_must_fail git rm -rf ""
 '
 
 test_done
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
@@ -332,9 +332,8 @@ test_expect_success 'git add --dry-run --ignore-missing of non-existing file out
 	test_i18ncmp expect.err actual.err
 '
 
-test_expect_success 'git add empty string should invoke warning' '
-	git add "" 2>output &&
-	test_i18ngrep "warning: empty strings" output
+test_expect_success 'git add empty string should fail' '
+	test_must_fail git add ""
 '
 
 test_done

Original file line number	Diff line number	Diff line change
`@@ -881,9 +881,8 @@ test_expect_success 'rm files with two different errors' '`
`881`	`881`	`test_i18ncmp expect actual`
`882`	`882`	`'`
`883`	`883`
`884`		`-test_expect_success 'rm empty string should invoke warning' '`
`885`		`- git rm -rf "" 2>output &&`
`886`		`- test_i18ngrep "warning: empty strings" output`
	`884`	`+test_expect_success 'rm empty string should fail' '`
	`885`	`+ test_must_fail git rm -rf ""`
`887`	`886`	`'`
`888`	`887`
`889`	`888`	`test_done`
Original file line number	Diff line number	Diff line change
`@@ -332,9 +332,8 @@ test_expect_success 'git add --dry-run --ignore-missing of non-existing file out`
`332`	`332`	`test_i18ncmp expect.err actual.err`
`333`	`333`	`'`
`334`	`334`
`335`		`-test_expect_success 'git add empty string should invoke warning' '`
`336`		`- git add "" 2>output &&`
`337`		`- test_i18ngrep "warning: empty strings" output`
	`335`	`+test_expect_success 'git add empty string should fail' '`
	`336`	`+ test_must_fail git add ""`
`338`	`337`	`'`
`339`	`338`
`340`	`339`	`test_done`