[thirdparty/git.git] / t / t3700-add.sh

#!/bin/sh
#
# Copyright (c) 2006 Carl D. Worth
#

test_description='Test of git add, including the -- option.'

. ./test-lib.sh

# Test the file mode "$1" of the file "$2" in the index.
test_mode_in_index () {
	case "$(git ls-files -s "$2")" in
	"$1 "*"	$2")
		echo pass
		;;
	*)
		echo fail
		git ls-files -s "$2"
		return 1
		;;
	esac
}

test_expect_success \
    'Test of git add' \
    'touch foo && git add foo'

test_expect_success \
    'Post-check that foo is in the index' \
    'git ls-files foo | grep foo'

test_expect_success \
    'Test that "git add -- -q" works' \
    'touch -- -q && git add -- -q'

test_expect_success \
	'git add: Test that executable bit is not used if core.filemode=0' \
	'git config core.filemode 0 &&
	 echo foo >xfoo1 &&
	 chmod 755 xfoo1 &&
	 git add xfoo1 &&
	 test_mode_in_index 100644 xfoo1'

test_expect_success 'git add: filemode=0 should not get confused by symlink' '
	rm -f xfoo1 &&
	test_ln_s_add foo xfoo1 &&
	test_mode_in_index 120000 xfoo1
'

test_expect_success \
	'git update-index --add: Test that executable bit is not used...' \
	'git config core.filemode 0 &&
	 echo foo >xfoo2 &&
	 chmod 755 xfoo2 &&
	 git update-index --add xfoo2 &&
	 test_mode_in_index 100644 xfoo2'

test_expect_success 'git add: filemode=0 should not get confused by symlink' '
	rm -f xfoo2 &&
	test_ln_s_add foo xfoo2 &&
	test_mode_in_index 120000 xfoo2
'

test_expect_success \
	'git update-index --add: Test that executable bit is not used...' \
	'git config core.filemode 0 &&
	 test_ln_s_add xfoo2 xfoo3 &&	# runs git update-index --add
	 test_mode_in_index 120000 xfoo3'

test_expect_success '.gitignore test setup' '
	echo "*.ig" >.gitignore &&
	mkdir c.if d.ig &&
	>a.ig && >b.if &&
	>c.if/c.if && >c.if/c.ig &&
	>d.ig/d.if && >d.ig/d.ig
'

test_expect_success '.gitignore is honored' '
	git add . &&
	! (git ls-files | grep "\\.ig")
'

test_expect_success 'error out when attempting to add ignored ones without -f' '
	test_must_fail git add a.?? &&
	! (git ls-files | grep "\\.ig")
'

test_expect_success 'error out when attempting to add ignored ones without -f' '
	test_must_fail git add d.?? &&
	! (git ls-files | grep "\\.ig")
'

test_expect_success 'error out when attempting to add ignored ones but add others' '
	touch a.if &&
	test_must_fail git add a.?? &&
	! (git ls-files | grep "\\.ig") &&
	(git ls-files | grep a.if)
'

test_expect_success 'add ignored ones with -f' '
	git add -f a.?? &&
	git ls-files --error-unmatch a.ig
'

test_expect_success 'add ignored ones with -f' '
	git add -f d.??/* &&
	git ls-files --error-unmatch d.ig/d.if d.ig/d.ig
'

test_expect_success 'add ignored ones with -f' '
	rm -f .git/index &&
	git add -f d.?? &&
	git ls-files --error-unmatch d.ig/d.if d.ig/d.ig
'

test_expect_success '.gitignore with subdirectory' '

	rm -f .git/index &&
	mkdir -p sub/dir &&
	echo "!dir/a.*" >sub/.gitignore &&
	>sub/a.ig &&
	>sub/dir/a.ig &&
	git add sub/dir &&
	git ls-files --error-unmatch sub/dir/a.ig &&
	rm -f .git/index &&
	(
		cd sub/dir &&
		git add .
	) &&
	git ls-files --error-unmatch sub/dir/a.ig
'

mkdir 1 1/2 1/3
touch 1/2/a 1/3/b 1/2/c
test_expect_success 'check correct prefix detection' '
	rm -f .git/index &&
	git add 1/2/a 1/3/b 1/2/c
'

test_expect_success 'git add with filemode=0, symlinks=0, and unmerged entries' '
	for s in 1 2 3
	do
		echo $s > stage$s
		echo "100755 $(git hash-object -w stage$s) $s	file"
		echo "120000 $(printf $s | git hash-object -w -t blob --stdin) $s	symlink"
	done | git update-index --index-info &&
	git config core.filemode 0 &&
	git config core.symlinks 0 &&
	echo new > file &&
	echo new > symlink &&
	git add file symlink &&
	git ls-files --stage | grep "^100755 .* 0	file$" &&
	git ls-files --stage | grep "^120000 .* 0	symlink$"
'

test_expect_success 'git add with filemode=0, symlinks=0 prefers stage 2 over stage 1' '
	git rm --cached -f file symlink &&
	(
		echo "100644 $(git hash-object -w stage1) 1	file" &&
		echo "100755 $(git hash-object -w stage2) 2	file" &&
		echo "100644 $(printf 1 | git hash-object -w -t blob --stdin) 1	symlink" &&
		echo "120000 $(printf 2 | git hash-object -w -t blob --stdin) 2	symlink"
	) | git update-index --index-info &&
	git config core.filemode 0 &&
	git config core.symlinks 0 &&
	echo new > file &&
	echo new > symlink &&
	git add file symlink &&
	git ls-files --stage | grep "^100755 .* 0	file$" &&
	git ls-files --stage | grep "^120000 .* 0	symlink$"
'

test_expect_success 'git add --refresh' '
	>foo && git add foo && git commit -a -m "commit all" &&
	test -z "$(git diff-index HEAD -- foo)" &&
	git read-tree HEAD &&
	case "$(git diff-index HEAD -- foo)" in
	:100644" "*"M	foo") echo pass;;
	*) echo fail; (exit 1);;
	esac &&
	git add --refresh -- foo &&
	test -z "$(git diff-index HEAD -- foo)"
'

test_expect_success 'git add --refresh with pathspec' '
	git reset --hard &&
	echo >foo && echo >bar && echo >baz &&
	git add foo bar baz && H=$(git rev-parse :foo) && git rm -f foo &&
	echo "100644 $H 3	foo" | git update-index --index-info &&
	test-tool chmtime -60 bar baz &&
	git add --refresh bar >actual &&
	test_must_be_empty actual &&

	git diff-files --name-only >actual &&
	! grep bar actual &&
	grep baz actual
'

test_expect_success POSIXPERM,SANITY 'git add should fail atomically upon an unreadable file' '
	git reset --hard &&
	date >foo1 &&
	date >foo2 &&
	chmod 0 foo2 &&
	test_must_fail git add --verbose . &&
	! ( git ls-files foo1 | grep foo1 )
'

rm -f foo2

test_expect_success POSIXPERM,SANITY 'git add --ignore-errors' '
	git reset --hard &&
	date >foo1 &&
	date >foo2 &&
	chmod 0 foo2 &&
	test_must_fail git add --verbose --ignore-errors . &&
	git ls-files foo1 | grep foo1
'

rm -f foo2

test_expect_success POSIXPERM,SANITY 'git add (add.ignore-errors)' '
	git config add.ignore-errors 1 &&
	git reset --hard &&
	date >foo1 &&
	date >foo2 &&
	chmod 0 foo2 &&
	test_must_fail git add --verbose . &&
	git ls-files foo1 | grep foo1
'
rm -f foo2

test_expect_success POSIXPERM,SANITY 'git add (add.ignore-errors = false)' '
	git config add.ignore-errors 0 &&
	git reset --hard &&
	date >foo1 &&
	date >foo2 &&
	chmod 0 foo2 &&
	test_must_fail git add --verbose . &&
	! ( git ls-files foo1 | grep foo1 )
'
rm -f foo2

test_expect_success POSIXPERM,SANITY '--no-ignore-errors overrides config' '
       git config add.ignore-errors 1 &&
       git reset --hard &&
       date >foo1 &&
       date >foo2 &&
       chmod 0 foo2 &&
       test_must_fail git add --verbose --no-ignore-errors . &&
       ! ( git ls-files foo1 | grep foo1 ) &&
       git config add.ignore-errors 0
'
rm -f foo2

test_expect_success BSLASHPSPEC "git add 'fo\\[ou\\]bar' ignores foobar" '
	git reset --hard &&
	touch fo\[ou\]bar foobar &&
	git add '\''fo\[ou\]bar'\'' &&
	git ls-files fo\[ou\]bar | fgrep fo\[ou\]bar &&
	! ( git ls-files foobar | grep foobar )
'

test_expect_success 'git add to resolve conflicts on otherwise ignored path' '
	git reset --hard &&
	H=$(git rev-parse :1/2/a) &&
	(
		echo "100644 $H 1	track-this" &&
		echo "100644 $H 3	track-this"
	) | git update-index --index-info &&
	echo track-this >>.gitignore &&
	echo resolved >track-this &&
	git add track-this
'

test_expect_success '"add non-existent" should fail' '
	test_must_fail git add non-existent &&
	! (git ls-files | grep "non-existent")
'

test_expect_success 'git add -A on empty repo does not error out' '
	rm -fr empty &&
	git init empty &&
	(
		cd empty &&
		git add -A . &&
		git add -A
	)
'

test_expect_success '"git add ." in empty repo' '
	rm -fr empty &&
	git init empty &&
	(
		cd empty &&
		git add .
	)
'

test_expect_success 'error on a repository with no commits' '
	rm -fr empty &&
	git init empty &&
	test_must_fail git add empty >actual 2>&1 &&
	cat >expect <<-EOF &&
	error: '"'empty/'"' does not have a commit checked out
	fatal: adding files failed
	EOF
	test_cmp expect actual
'

test_expect_success 'git add --dry-run of existing changed file' "
	echo new >>track-this &&
	git add --dry-run track-this >actual 2>&1 &&
	echo \"add 'track-this'\" | test_cmp - actual
"

test_expect_success 'git add --dry-run of non-existing file' "
	echo ignored-file >>.gitignore &&
	test_must_fail git add --dry-run track-this ignored-file >actual 2>&1
"

test_expect_success 'git add --dry-run of an existing file output' "
	echo \"fatal: pathspec 'ignored-file' did not match any files\" >expect &&
	test_cmp expect actual
"

cat >expect.err <<\EOF
The following paths are ignored by one of your .gitignore files:
ignored-file
hint: Use -f if you really want to add them.
hint: Turn this message off by running
hint: "git config advice.addIgnoredFile false"
EOF
cat >expect.out <<\EOF
add 'track-this'
EOF

test_expect_success 'git add --dry-run --ignore-missing of non-existing file' '
	test_must_fail git add --dry-run --ignore-missing track-this ignored-file >actual.out 2>actual.err
'

test_expect_success 'git add --dry-run --ignore-missing of non-existing file output' '
	test_cmp expect.out actual.out &&
	test_cmp expect.err actual.err
'

test_expect_success 'git add empty string should fail' '
	test_must_fail git add ""
'

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 &&
	git reset --hard &&
	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' '
	rm -fr empty &&
	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_expect_success CASE_INSENSITIVE_FS 'path is case-insensitive' '
	path="$(pwd)/BLUB" &&
	touch "$path" &&
	downcased="$(echo "$path" | tr A-Z a-z)" &&
	git add "$downcased"
'

test_done
Commit	Line	Data
60ace879 CW	1	#!/bin/sh
	2	#
	3	# Copyright (c) 2006 Carl D. Worth
	4	#
	5
5be60078	6	test_description='Test of git add, including the -- option.'
60ace879 CW	7
	8	. ./test-lib.sh
	9
766cdc41 IB	10	# Test the file mode "$1" of the file "$2" in the index.
	11	test_mode_in_index () {
	12	case "$(git ls-files -s "$2")" in
	13	"$1 "*" $2")
	14	echo pass
	15	;;
	16	*)
	17	echo fail
	18	git ls-files -s "$2"
	19	return 1
	20	;;
	21	esac
	22	}
	23
60ace879	24	test_expect_success \
5be60078 JH	25	'Test of git add' \
5be60078 JH	26	'touch foo && git add foo'
60ace879 CW	27
	28	test_expect_success \
	29	'Post-check that foo is in the index' \
5be60078	30	'git ls-files foo \| grep foo'
60ace879 CW	31
60ace879 CW	32	test_expect_success \
5be60078 JH	33	'Test that "git add -- -q" works' \
5be60078 JH	34	'touch -- -q && git add -- -q'
60ace879	35
fd28b34a	36	test_expect_success \
5be60078	37	'git add: Test that executable bit is not used if core.filemode=0' \
e0d10e1c	38	'git config core.filemode 0 &&
fd28b34a SP	39	echo foo >xfoo1 &&
fd28b34a SP	40	chmod 755 xfoo1 &&
5be60078	41	git add xfoo1 &&
766cdc41	42	test_mode_in_index 100644 xfoo1'
fd28b34a	43
889c6f0e	44	test_expect_success 'git add: filemode=0 should not get confused by symlink' '
185c975f	45	rm -f xfoo1 &&
889c6f0e	46	test_ln_s_add foo xfoo1 &&
766cdc41	47	test_mode_in_index 120000 xfoo1
185c975f JH	48	'
185c975f JH	49
fd28b34a	50	test_expect_success \
5be60078	51	'git update-index --add: Test that executable bit is not used...' \
e0d10e1c	52	'git config core.filemode 0 &&
fd28b34a SP	53	echo foo >xfoo2 &&
fd28b34a SP	54	chmod 755 xfoo2 &&
5be60078	55	git update-index --add xfoo2 &&
766cdc41	56	test_mode_in_index 100644 xfoo2'
2bbaaed9	57
889c6f0e	58	test_expect_success 'git add: filemode=0 should not get confused by symlink' '
185c975f	59	rm -f xfoo2 &&
889c6f0e	60	test_ln_s_add foo xfoo2 &&
766cdc41	61	test_mode_in_index 120000 xfoo2
185c975f JH	62	'
185c975f JH	63
889c6f0e	64	test_expect_success \
5be60078	65	'git update-index --add: Test that executable bit is not used...' \
e0d10e1c	66	'git config core.filemode 0 &&
889c6f0e	67	test_ln_s_add xfoo2 xfoo3 && # runs git update-index --add
766cdc41	68	test_mode_in_index 120000 xfoo3'
fd28b34a	69
4d06f8ac JH	70	test_expect_success '.gitignore test setup' '
	71	echo "*.ig" >.gitignore &&
	72	mkdir c.if d.ig &&
	73	>a.ig && >b.if &&
	74	>c.if/c.if && >c.if/c.ig &&
	75	>d.ig/d.if && >d.ig/d.ig
	76	'
	77
	78	test_expect_success '.gitignore is honored' '
5be60078	79	git add . &&
bbf08124	80	! (git ls-files \| grep "\\.ig")
4d06f8ac JH	81	'
	82
	83	test_expect_success 'error out when attempting to add ignored ones without -f' '
d492b31c	84	test_must_fail git add a.?? &&
bbf08124	85	! (git ls-files \| grep "\\.ig")
4d06f8ac JH	86	'
	87
	88	test_expect_success 'error out when attempting to add ignored ones without -f' '
d492b31c	89	test_must_fail git add d.?? &&
bbf08124	90	! (git ls-files \| grep "\\.ig")
4d06f8ac JH	91	'
4d06f8ac JH	92
1d31e5a2 MG	93	test_expect_success 'error out when attempting to add ignored ones but add others' '
	94	touch a.if &&
	95	test_must_fail git add a.?? &&
	96	! (git ls-files \| grep "\\.ig") &&
	97	(git ls-files \| grep a.if)
	98	'
	99
4d06f8ac	100	test_expect_success 'add ignored ones with -f' '
5be60078 JH	101	git add -f a.?? &&
5be60078 JH	102	git ls-files --error-unmatch a.ig
4d06f8ac JH	103	'
	104
	105	test_expect_success 'add ignored ones with -f' '
5be60078 JH	106	git add -f d.??/* &&
5be60078 JH	107	git ls-files --error-unmatch d.ig/d.if d.ig/d.ig
4d06f8ac JH	108	'
4d06f8ac JH	109
41a7aa58 JH	110	test_expect_success 'add ignored ones with -f' '
	111	rm -f .git/index &&
	112	git add -f d.?? &&
	113	git ls-files --error-unmatch d.ig/d.if d.ig/d.ig
	114	'
	115
	116	test_expect_success '.gitignore with subdirectory' '
	117
	118	rm -f .git/index &&
	119	mkdir -p sub/dir &&
	120	echo "!dir/a.*" >sub/.gitignore &&
	121	>sub/a.ig &&
	122	>sub/dir/a.ig &&
	123	git add sub/dir &&
	124	git ls-files --error-unmatch sub/dir/a.ig &&
	125	rm -f .git/index &&
	126	(
	127	cd sub/dir &&
	128	git add .
	129	) &&
	130	git ls-files --error-unmatch sub/dir/a.ig
	131	'
	132
c7f34c18 JS	133	mkdir 1 1/2 1/3
	134	touch 1/2/a 1/3/b 1/2/c
	135	test_expect_success 'check correct prefix detection' '
41a7aa58	136	rm -f .git/index &&
c7f34c18 JS	137	git add 1/2/a 1/3/b 1/2/c
	138	'
	139
05dcd698	140	test_expect_success 'git add with filemode=0, symlinks=0, and unmerged entries' '
20314271 JS	141	for s in 1 2 3
20314271 JS	142	do
05dcd698	143	echo $s > stage$s
20314271	144	echo "100755 $(git hash-object -w stage$s) $s file"
05dcd698	145	echo "120000 $(printf $s \| git hash-object -w -t blob --stdin) $s symlink"
20314271 JS	146	done \| git update-index --index-info &&
20314271 JS	147	git config core.filemode 0 &&
05dcd698	148	git config core.symlinks 0 &&
20314271	149	echo new > file &&
05dcd698 JS	150	echo new > symlink &&
	151	git add file symlink &&
	152	git ls-files --stage \| grep "^100755 .* 0 file$" &&
	153	git ls-files --stage \| grep "^120000 .* 0 symlink$"
20314271 JS	154	'
20314271 JS	155
05dcd698 JS	156	test_expect_success 'git add with filemode=0, symlinks=0 prefers stage 2 over stage 1' '
05dcd698 JS	157	git rm --cached -f file symlink &&
20314271	158	(
3ea67379 ES	159	echo "100644 $(git hash-object -w stage1) 1 file" &&
	160	echo "100755 $(git hash-object -w stage2) 2 file" &&
	161	echo "100644 $(printf 1 \| git hash-object -w -t blob --stdin) 1 symlink" &&
a697ec69	162	echo "120000 $(printf 2 \| git hash-object -w -t blob --stdin) 2 symlink"
20314271 JS	163	) \| git update-index --index-info &&
20314271 JS	164	git config core.filemode 0 &&
05dcd698	165	git config core.symlinks 0 &&
20314271	166	echo new > file &&
05dcd698 JS	167	echo new > symlink &&
	168	git add file symlink &&
	169	git ls-files --stage \| grep "^100755 .* 0 file$" &&
	170	git ls-files --stage \| grep "^120000 .* 0 symlink$"
20314271 JS	171	'
20314271 JS	172
d616813d AJ	173	test_expect_success 'git add --refresh' '
d616813d AJ	174	>foo && git add foo && git commit -a -m "commit all" &&
ed6c2314	175	test -z "$(git diff-index HEAD -- foo)" &&
d616813d	176	git read-tree HEAD &&
ed6c2314	177	case "$(git diff-index HEAD -- foo)" in
335f8787	178	:100644" "*"M foo") echo pass;;
d616813d AJ	179	*) echo fail; (exit 1);;
	180	esac &&
	181	git add --refresh -- foo &&
ed6c2314	182	test -z "$(git diff-index HEAD -- foo)"
d616813d AJ	183	'
d616813d AJ	184
3d1f148c JH	185	test_expect_success 'git add --refresh with pathspec' '
	186	git reset --hard &&
	187	echo >foo && echo >bar && echo >baz &&
	188	git add foo bar baz && H=$(git rev-parse :foo) && git rm -f foo &&
	189	echo "100644 $H 3 foo" \| git update-index --index-info &&
0e496492	190	test-tool chmtime -60 bar baz &&
3d1f148c	191	git add --refresh bar >actual &&
d3c6751b	192	test_must_be_empty actual &&
3d1f148c JH	193
3d1f148c JH	194	git diff-files --name-only >actual &&
64d1022e	195	! grep bar actual &&
3d1f148c JH	196	grep baz actual
	197	'
	198
c91cfd19	199	test_expect_success POSIXPERM,SANITY 'git add should fail atomically upon an unreadable file' '
89597436 AR	200	git reset --hard &&
	201	date >foo1 &&
	202	date >foo2 &&
	203	chmod 0 foo2 &&
	204	test_must_fail git add --verbose . &&
	205	! ( git ls-files foo1 \| grep foo1 )
	206	'
	207
	208	rm -f foo2
	209
c91cfd19	210	test_expect_success POSIXPERM,SANITY 'git add --ignore-errors' '
89597436 AR	211	git reset --hard &&
	212	date >foo1 &&
	213	date >foo2 &&
	214	chmod 0 foo2 &&
	215	test_must_fail git add --verbose --ignore-errors . &&
	216	git ls-files foo1 \| grep foo1
	217	'
	218
	219	rm -f foo2
	220
c91cfd19	221	test_expect_success POSIXPERM,SANITY 'git add (add.ignore-errors)' '
dad25e4a AR	222	git config add.ignore-errors 1 &&
	223	git reset --hard &&
	224	date >foo1 &&
	225	date >foo2 &&
	226	chmod 0 foo2 &&
	227	test_must_fail git add --verbose . &&
	228	git ls-files foo1 \| grep foo1
	229	'
	230	rm -f foo2
	231
c91cfd19	232	test_expect_success POSIXPERM,SANITY 'git add (add.ignore-errors = false)' '
dad25e4a AR	233	git config add.ignore-errors 0 &&
	234	git reset --hard &&
	235	date >foo1 &&
	236	date >foo2 &&
	237	chmod 0 foo2 &&
	238	test_must_fail git add --verbose . &&
	239	! ( git ls-files foo1 \| grep foo1 )
	240	'
ed342fde SB	241	rm -f foo2
ed342fde SB	242
c91cfd19	243	test_expect_success POSIXPERM,SANITY '--no-ignore-errors overrides config' '
ed342fde SB	244	git config add.ignore-errors 1 &&
	245	git reset --hard &&
	246	date >foo1 &&
	247	date >foo2 &&
	248	chmod 0 foo2 &&
	249	test_must_fail git add --verbose --no-ignore-errors . &&
	250	! ( git ls-files foo1 \| grep foo1 ) &&
	251	git config add.ignore-errors 0
	252	'
	253	rm -f foo2
dad25e4a	254
6fd1106a	255	test_expect_success BSLASHPSPEC "git add 'fo\\[ou\\]bar' ignores foobar" '
ea335b56	256	git reset --hard &&
8134a003 AR	257	touch fo\[ou\]bar foobar &&
8134a003 AR	258	git add '\''fo\[ou\]bar'\'' &&
87539416	259	git ls-files fo\[ou\]bar \| fgrep fo\[ou\]bar &&
ea335b56 KB	260	! ( git ls-files foobar \| grep foobar )
	261	'
	262
6e4f981f JK	263	test_expect_success 'git add to resolve conflicts on otherwise ignored path' '
	264	git reset --hard &&
	265	H=$(git rev-parse :1/2/a) &&
	266	(
3ea67379	267	echo "100644 $H 1 track-this" &&
6e4f981f JK	268	echo "100644 $H 3 track-this"
	269	) \| git update-index --index-info &&
	270	echo track-this >>.gitignore &&
	271	echo resolved >track-this &&
	272	git add track-this
	273	'
	274
1e7ef746 CP	275	test_expect_success '"add non-existent" should fail' '
	276	test_must_fail git add non-existent &&
	277	! (git ls-files \| grep "non-existent")
	278	'
	279
64ed07ce NTND	280	test_expect_success 'git add -A on empty repo does not error out' '
	281	rm -fr empty &&
	282	git init empty &&
	283	(
	284	cd empty &&
	285	git add -A . &&
	286	git add -A
	287	)
	288	'
	289
	290	test_expect_success '"git add ." in empty repo' '
	291	rm -fr empty &&
	292	git init empty &&
	293	(
	294	cd empty &&
	295	git add .
	296	)
	297	'
	298
f937bc2f KM	299	test_expect_success 'error on a repository with no commits' '
	300	rm -fr empty &&
	301	git init empty &&
	302	test_must_fail git add empty >actual 2>&1 &&
	303	cat >expect <<-EOF &&
	304	error: '"'empty/'"' does not have a commit checked out
	305	fatal: adding files failed
	306	EOF
1108cea7	307	test_cmp expect actual
f937bc2f KM	308	'
f937bc2f KM	309
108da0db JL	310	test_expect_success 'git add --dry-run of existing changed file' "
	311	echo new >>track-this &&
	312	git add --dry-run track-this >actual 2>&1 &&
	313	echo \"add 'track-this'\" \| test_cmp - actual
	314	"
	315
	316	test_expect_success 'git add --dry-run of non-existing file' "
	317	echo ignored-file >>.gitignore &&
48168851 ÆAB	318	test_must_fail git add --dry-run track-this ignored-file >actual 2>&1
	319	"
	320
68b2a005	321	test_expect_success 'git add --dry-run of an existing file output' "
48168851	322	echo \"fatal: pathspec 'ignored-file' did not match any files\" >expect &&
1108cea7	323	test_cmp expect actual
108da0db JL	324	"
108da0db JL	325
c1e02b2b	326	cat >expect.err <<\EOF
108da0db JL	327	The following paths are ignored by one of your .gitignore files:
108da0db JL	328	ignored-file
bf66db37	329	hint: Use -f if you really want to add them.
887a0fd5 HW	330	hint: Turn this message off by running
887a0fd5 HW	331	hint: "git config advice.addIgnoredFile false"
c1e02b2b JS	332	EOF
c1e02b2b JS	333	cat >expect.out <<\EOF
108da0db JL	334	add 'track-this'
	335	EOF
	336
	337	test_expect_success 'git add --dry-run --ignore-missing of non-existing file' '
439fb829 ÆAB	338	test_must_fail git add --dry-run --ignore-missing track-this ignored-file >actual.out 2>actual.err
	339	'
	340
68b2a005	341	test_expect_success 'git add --dry-run --ignore-missing of non-existing file output' '
1108cea7 ÆAB	342	test_cmp expect.out actual.out &&
1108cea7 ÆAB	343	test_cmp expect.err actual.err
108da0db JL	344	'
108da0db JL	345
9e4e8a64 EX	346	test_expect_success 'git add empty string should fail' '
9e4e8a64 EX	347	test_must_fail git add ""
d426430e EX	348	'
d426430e EX	349
b38ab197	350	test_expect_success 'git add --chmod=[+-]x stages correctly' '
c0fa44d8	351	rm -f foo1 &&
4e55ed32 ET	352	echo foo >foo1 &&
4e55ed32 ET	353	git add --chmod=+x foo1 &&
766cdc41	354	test_mode_in_index 100755 foo1 &&
b38ab197	355	git add --chmod=-x foo1 &&
766cdc41	356	test_mode_in_index 100644 foo1
4e55ed32 ET	357	'
	358
	359	test_expect_success POSIXPERM,SYMLINKS 'git add --chmod=+x with symlinks' '
	360	git config core.filemode 1 &&
	361	git config core.symlinks 1 &&
c0fa44d8	362	rm -f foo2 &&
4e55ed32 ET	363	echo foo >foo2 &&
4e55ed32 ET	364	git add --chmod=+x foo2 &&
766cdc41	365	test_mode_in_index 100755 foo2
4e55ed32 ET	366	'
4e55ed32 ET	367
610d55af	368	test_expect_success 'git add --chmod=[+-]x changes index with already added file' '
76e368c3	369	rm -f foo3 xfoo3 &&
57ea241e	370	git reset --hard &&
610d55af TG	371	echo foo >foo3 &&
	372	git add foo3 &&
	373	git add --chmod=+x foo3 &&
	374	test_mode_in_index 100755 foo3 &&
	375	echo foo >xfoo3 &&
	376	chmod 755 xfoo3 &&
	377	git add xfoo3 &&
	378	git add --chmod=-x xfoo3 &&
	379	test_mode_in_index 100644 xfoo3
	380	'
	381
40e0dc17	382	test_expect_success POSIXPERM 'git add --chmod=[+-]x does not change the working tree' '
610d55af TG	383	echo foo >foo4 &&
	384	git add foo4 &&
	385	git add --chmod=+x foo4 &&
40e0dc17	386	! test -x foo4
610d55af TG	387	'
	388
	389	test_expect_success 'no file status change if no pathspec is given' '
	390	>foo5 &&
	391	>foo6 &&
	392	git add foo5 foo6 &&
	393	git add --chmod=+x &&
	394	test_mode_in_index 100644 foo5 &&
	395	test_mode_in_index 100644 foo6
	396	'
	397
	398	test_expect_success 'no file status change if no pathspec is given in subdir' '
b07ad464	399	mkdir -p sub &&
610d55af TG	400	(
	401	cd sub &&
	402	>sub-foo1 &&
	403	>sub-foo2 &&
	404	git add . &&
	405	git add --chmod=+x &&
	406	test_mode_in_index 100644 sub-foo1 &&
	407	test_mode_in_index 100644 sub-foo2
	408	)
	409	'
	410
	411	test_expect_success 'all statuses changed in folder if . is given' '
b2282704	412	rm -fr empty &&
610d55af TG	413	git add --chmod=+x . &&
	414	test $(git ls-files --stage \| grep ^100644 \| wc -l) -eq 0 &&
	415	git add --chmod=-x . &&
	416	test $(git ls-files --stage \| grep ^100755 \| wc -l) -eq 0
	417	'
	418
d8727b36 JS	419	test_expect_success CASE_INSENSITIVE_FS 'path is case-insensitive' '
	420	path="$(pwd)/BLUB" &&
	421	touch "$path" &&
	422	downcased="$(echo "$path" \| tr A-Z a-z)" &&
	423	git add "$downcased"
	424	'
	425
60ace879	426	test_done