From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Oct 2016 20:14:56 +0000 (-0700)
Subject: Merge branch 'ex/deprecate-empty-pathspec-as-match-all'
X-Git-Tag: v2.11.0-rc0~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b1e135b879c401c8e6c0b9acbaefc81054c3d37;p=git

Merge branch 'ex/deprecate-empty-pathspec-as-match-all'

An empty string used as a pathspec element has always meant
'everything matches', but it is too easy to write a script that
finds a path to remove in $path and run 'git rm "$paht"', which
ends up removing everything.  Start warning about this use of an
empty string used for 'everything matches' and ask users to use a
more explicit '.' for that instead.

The hope is that existing users will not mind this change, and
eventually the warning can be turned into a hard error, upgrading
the deprecation into removal of this (mis)feature.

* ex/deprecate-empty-pathspec-as-match-all:
  pathspec: warn on empty strings as pathspec
---

3b1e135b879c401c8e6c0b9acbaefc81054c3d37
diff --cc t/t3700-add.sh
index 53c0cb6dea,05379d0a4a..f3a4b4a913
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@@ -331,71 -332,9 +331,76 @@@ test_expect_success 'git add --dry-run 
  	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 --chmod=[+-]x stages correctly' '
 +	rm -f foo1 &&
 +	echo foo >foo1 &&
 +	git add --chmod=+x foo1 &&
 +	test_mode_in_index 100755 foo1 &&
 +	git add --chmod=-x foo1 &&
 +	test_mode_in_index 100644 foo1
 +'
 +
 +test_expect_success POSIXPERM,SYMLINKS 'git add --chmod=+x with symlinks' '
 +	git config core.filemode 1 &&
 +	git config core.symlinks 1 &&
 +	rm -f foo2 &&
 +	echo foo >foo2 &&
 +	git add --chmod=+x foo2 &&
 +	test_mode_in_index 100755 foo2
 +'
 +
 +test_expect_success 'git add --chmod=[+-]x changes index with already added file' '
 +	rm -f foo3 xfoo3 &&
 +	echo foo >foo3 &&
 +	git add foo3 &&
 +	git add --chmod=+x foo3 &&
 +	test_mode_in_index 100755 foo3 &&
 +	echo foo >xfoo3 &&
 +	chmod 755 xfoo3 &&
 +	git add xfoo3 &&
 +	git add --chmod=-x xfoo3 &&
 +	test_mode_in_index 100644 xfoo3
 +'
 +
 +test_expect_success POSIXPERM 'git add --chmod=[+-]x does not change the working tree' '
 +	echo foo >foo4 &&
 +	git add foo4 &&
 +	git add --chmod=+x foo4 &&
 +	! test -x foo4
 +'
 +
 +test_expect_success 'no file status change if no pathspec is given' '
 +	>foo5 &&
 +	>foo6 &&
 +	git add foo5 foo6 &&
 +	git add --chmod=+x &&
 +	test_mode_in_index 100644 foo5 &&
 +	test_mode_in_index 100644 foo6
 +'
 +
 +test_expect_success 'no file status change if no pathspec is given in subdir' '
 +	mkdir -p sub &&
 +	(
 +		cd sub &&
 +		>sub-foo1 &&
 +		>sub-foo2 &&
 +		git add . &&
 +		git add --chmod=+x &&
 +		test_mode_in_index 100644 sub-foo1 &&
 +		test_mode_in_index 100644 sub-foo2
 +	)
 +'
 +
 +test_expect_success 'all statuses changed in folder if . is given' '
 +	git add --chmod=+x . &&
 +	test $(git ls-files --stage | grep ^100644 | wc -l) -eq 0 &&
 +	git add --chmod=-x . &&
 +	test $(git ls-files --stage | grep ^100755 | wc -l) -eq 0
 +'
 +
  test_done