[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_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 &&
	 case "`git ls-files --stage xfoo1`" in
	 100644" "*xfoo1) echo pass;;
	 *) echo fail; git ls-files --stage xfoo1; (exit 1);;
	 esac'

test_expect_success 'git add: filemode=0 should not get confused by symlink' '
	rm -f xfoo1 &&
	test_ln_s_add foo xfoo1 &&
	case "`git ls-files --stage xfoo1`" in
	120000" "*xfoo1) echo pass;;
	*) echo fail; git ls-files --stage xfoo1; (exit 1);;
	esac
'

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 &&
	 case "`git ls-files --stage xfoo2`" in
	 100644" "*xfoo2) echo pass;;
	 *) echo fail; git ls-files --stage xfoo2; (exit 1);;
	 esac'

test_expect_success 'git add: filemode=0 should not get confused by symlink' '
	rm -f xfoo2 &&
	test_ln_s_add foo xfoo2 &&
	case "`git ls-files --stage xfoo2`" in
	120000" "*xfoo2) echo pass;;
	*) echo fail; git ls-files --stage xfoo2; (exit 1);;
	esac
'

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
	 case "`git ls-files --stage xfoo3`" in
	 120000" "*xfoo3) echo pass;;
	 *) echo fail; git ls-files --stage xfoo3; (exit 1);;
	 esac'

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 '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-chmtime -60 bar baz &&
	>expect &&
	git add --refresh bar >actual &&
	test_cmp expect 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 --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_i18ncmp expect actual
"

cat >expect.err <<\EOF
The following paths are ignored by one of your .gitignore files:
ignored-file
Use -f if you really want to add them.
fatal: no files added
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_i18ncmp expect.out actual.out &&
	test_i18ncmp expect.err actual.err
'

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
	10	test_expect_success \
5be60078 JH	11	'Test of git add' \
5be60078 JH	12	'touch foo && git add foo'
60ace879 CW	13
	14	test_expect_success \
	15	'Post-check that foo is in the index' \
5be60078	16	'git ls-files foo \| grep foo'
60ace879 CW	17
60ace879 CW	18	test_expect_success \
5be60078 JH	19	'Test that "git add -- -q" works' \
5be60078 JH	20	'touch -- -q && git add -- -q'
60ace879	21
fd28b34a	22	test_expect_success \
5be60078	23	'git add: Test that executable bit is not used if core.filemode=0' \
e0d10e1c	24	'git config core.filemode 0 &&
fd28b34a SP	25	echo foo >xfoo1 &&
fd28b34a SP	26	chmod 755 xfoo1 &&
5be60078 JH	27	git add xfoo1 &&
5be60078 JH	28	case "`git ls-files --stage xfoo1`" in
335f8787	29	100644" "*xfoo1) echo pass;;
5be60078	30	*) echo fail; git ls-files --stage xfoo1; (exit 1);;
fd28b34a SP	31	esac'
fd28b34a SP	32
889c6f0e	33	test_expect_success 'git add: filemode=0 should not get confused by symlink' '
185c975f	34	rm -f xfoo1 &&
889c6f0e	35	test_ln_s_add foo xfoo1 &&
5be60078	36	case "`git ls-files --stage xfoo1`" in
335f8787	37	120000" "*xfoo1) echo pass;;
5be60078	38	*) echo fail; git ls-files --stage xfoo1; (exit 1);;
185c975f JH	39	esac
	40	'
	41
fd28b34a	42	test_expect_success \
5be60078	43	'git update-index --add: Test that executable bit is not used...' \
e0d10e1c	44	'git config core.filemode 0 &&
fd28b34a SP	45	echo foo >xfoo2 &&
fd28b34a SP	46	chmod 755 xfoo2 &&
5be60078 JH	47	git update-index --add xfoo2 &&
5be60078 JH	48	case "`git ls-files --stage xfoo2`" in
335f8787	49	100644" "*xfoo2) echo pass;;
5be60078	50	*) echo fail; git ls-files --stage xfoo2; (exit 1);;
2bbaaed9 JH	51	esac'
2bbaaed9 JH	52
889c6f0e	53	test_expect_success 'git add: filemode=0 should not get confused by symlink' '
185c975f	54	rm -f xfoo2 &&
889c6f0e	55	test_ln_s_add foo xfoo2 &&
5be60078	56	case "`git ls-files --stage xfoo2`" in
335f8787	57	120000" "*xfoo2) echo pass;;
5be60078	58	*) echo fail; git ls-files --stage xfoo2; (exit 1);;
185c975f JH	59	esac
	60	'
	61
889c6f0e	62	test_expect_success \
5be60078	63	'git update-index --add: Test that executable bit is not used...' \
e0d10e1c	64	'git config core.filemode 0 &&
889c6f0e	65	test_ln_s_add xfoo2 xfoo3 && # runs git update-index --add
5be60078	66	case "`git ls-files --stage xfoo3`" in
335f8787	67	120000" "*xfoo3) echo pass;;
5be60078	68	*) echo fail; git ls-files --stage xfoo3; (exit 1);;
fd28b34a SP	69	esac'
fd28b34a SP	70
4d06f8ac JH	71	test_expect_success '.gitignore test setup' '
	72	echo "*.ig" >.gitignore &&
	73	mkdir c.if d.ig &&
	74	>a.ig && >b.if &&
	75	>c.if/c.if && >c.if/c.ig &&
	76	>d.ig/d.if && >d.ig/d.ig
	77	'
	78
	79	test_expect_success '.gitignore is honored' '
5be60078	80	git add . &&
bbf08124	81	! (git ls-files \| grep "\\.ig")
4d06f8ac JH	82	'
	83
	84	test_expect_success 'error out when attempting to add ignored ones without -f' '
d492b31c	85	test_must_fail git add a.?? &&
bbf08124	86	! (git ls-files \| grep "\\.ig")
4d06f8ac JH	87	'
	88
	89	test_expect_success 'error out when attempting to add ignored ones without -f' '
d492b31c	90	test_must_fail git add d.?? &&
bbf08124	91	! (git ls-files \| grep "\\.ig")
4d06f8ac JH	92	'
	93
	94	test_expect_success 'add ignored ones with -f' '
5be60078 JH	95	git add -f a.?? &&
5be60078 JH	96	git ls-files --error-unmatch a.ig
4d06f8ac JH	97	'
	98
	99	test_expect_success 'add ignored ones with -f' '
5be60078 JH	100	git add -f d.??/* &&
5be60078 JH	101	git ls-files --error-unmatch d.ig/d.if d.ig/d.ig
4d06f8ac JH	102	'
4d06f8ac JH	103
41a7aa58 JH	104	test_expect_success 'add ignored ones with -f' '
	105	rm -f .git/index &&
	106	git add -f d.?? &&
	107	git ls-files --error-unmatch d.ig/d.if d.ig/d.ig
	108	'
	109
	110	test_expect_success '.gitignore with subdirectory' '
	111
	112	rm -f .git/index &&
	113	mkdir -p sub/dir &&
	114	echo "!dir/a.*" >sub/.gitignore &&
	115	>sub/a.ig &&
	116	>sub/dir/a.ig &&
	117	git add sub/dir &&
	118	git ls-files --error-unmatch sub/dir/a.ig &&
	119	rm -f .git/index &&
	120	(
	121	cd sub/dir &&
	122	git add .
	123	) &&
	124	git ls-files --error-unmatch sub/dir/a.ig
	125	'
	126
c7f34c18 JS	127	mkdir 1 1/2 1/3
	128	touch 1/2/a 1/3/b 1/2/c
	129	test_expect_success 'check correct prefix detection' '
41a7aa58	130	rm -f .git/index &&
c7f34c18 JS	131	git add 1/2/a 1/3/b 1/2/c
	132	'
	133
05dcd698	134	test_expect_success 'git add with filemode=0, symlinks=0, and unmerged entries' '
20314271 JS	135	for s in 1 2 3
20314271 JS	136	do
05dcd698	137	echo $s > stage$s
20314271	138	echo "100755 $(git hash-object -w stage$s) $s file"
05dcd698	139	echo "120000 $(printf $s \| git hash-object -w -t blob --stdin) $s symlink"
20314271 JS	140	done \| git update-index --index-info &&
20314271 JS	141	git config core.filemode 0 &&
05dcd698	142	git config core.symlinks 0 &&
20314271	143	echo new > file &&
05dcd698 JS	144	echo new > symlink &&
	145	git add file symlink &&
	146	git ls-files --stage \| grep "^100755 .* 0 file$" &&
	147	git ls-files --stage \| grep "^120000 .* 0 symlink$"
20314271 JS	148	'
20314271 JS	149
05dcd698 JS	150	test_expect_success 'git add with filemode=0, symlinks=0 prefers stage 2 over stage 1' '
05dcd698 JS	151	git rm --cached -f file symlink &&
20314271 JS	152	(
	153	echo "100644 $(git hash-object -w stage1) 1 file"
	154	echo "100755 $(git hash-object -w stage2) 2 file"
a697ec69 JH	155	echo "100644 $(printf 1 \| git hash-object -w -t blob --stdin) 1 symlink"
a697ec69 JH	156	echo "120000 $(printf 2 \| git hash-object -w -t blob --stdin) 2 symlink"
20314271 JS	157	) \| git update-index --index-info &&
20314271 JS	158	git config core.filemode 0 &&
05dcd698	159	git config core.symlinks 0 &&
20314271	160	echo new > file &&
05dcd698 JS	161	echo new > symlink &&
	162	git add file symlink &&
	163	git ls-files --stage \| grep "^100755 .* 0 file$" &&
	164	git ls-files --stage \| grep "^120000 .* 0 symlink$"
20314271 JS	165	'
20314271 JS	166
d616813d AJ	167	test_expect_success 'git add --refresh' '
	168	>foo && git add foo && git commit -a -m "commit all" &&
	169	test -z "`git diff-index HEAD -- foo`" &&
	170	git read-tree HEAD &&
	171	case "`git diff-index HEAD -- foo`" in
335f8787	172	:100644" "*"M foo") echo pass;;
d616813d AJ	173	*) echo fail; (exit 1);;
	174	esac &&
	175	git add --refresh -- foo &&
	176	test -z "`git diff-index HEAD -- foo`"
	177	'
	178
3d1f148c JH	179	test_expect_success 'git add --refresh with pathspec' '
	180	git reset --hard &&
	181	echo >foo && echo >bar && echo >baz &&
	182	git add foo bar baz && H=$(git rev-parse :foo) && git rm -f foo &&
	183	echo "100644 $H 3 foo" \| git update-index --index-info &&
	184	test-chmtime -60 bar baz &&
	185	>expect &&
	186	git add --refresh bar >actual &&
	187	test_cmp expect actual &&
	188
	189	git diff-files --name-only >actual &&
	190	! grep bar actual&&
	191	grep baz actual
	192	'
	193
c91cfd19	194	test_expect_success POSIXPERM,SANITY 'git add should fail atomically upon an unreadable file' '
89597436 AR	195	git reset --hard &&
	196	date >foo1 &&
	197	date >foo2 &&
	198	chmod 0 foo2 &&
	199	test_must_fail git add --verbose . &&
	200	! ( git ls-files foo1 \| grep foo1 )
	201	'
	202
	203	rm -f foo2
	204
c91cfd19	205	test_expect_success POSIXPERM,SANITY 'git add --ignore-errors' '
89597436 AR	206	git reset --hard &&
	207	date >foo1 &&
	208	date >foo2 &&
	209	chmod 0 foo2 &&
	210	test_must_fail git add --verbose --ignore-errors . &&
	211	git ls-files foo1 \| grep foo1
	212	'
	213
	214	rm -f foo2
	215
c91cfd19	216	test_expect_success POSIXPERM,SANITY 'git add (add.ignore-errors)' '
dad25e4a AR	217	git config add.ignore-errors 1 &&
	218	git reset --hard &&
	219	date >foo1 &&
	220	date >foo2 &&
	221	chmod 0 foo2 &&
	222	test_must_fail git add --verbose . &&
	223	git ls-files foo1 \| grep foo1
	224	'
	225	rm -f foo2
	226
c91cfd19	227	test_expect_success POSIXPERM,SANITY 'git add (add.ignore-errors = false)' '
dad25e4a AR	228	git config add.ignore-errors 0 &&
	229	git reset --hard &&
	230	date >foo1 &&
	231	date >foo2 &&
	232	chmod 0 foo2 &&
	233	test_must_fail git add --verbose . &&
	234	! ( git ls-files foo1 \| grep foo1 )
	235	'
ed342fde SB	236	rm -f foo2
ed342fde SB	237
c91cfd19	238	test_expect_success POSIXPERM,SANITY '--no-ignore-errors overrides config' '
ed342fde SB	239	git config add.ignore-errors 1 &&
	240	git reset --hard &&
	241	date >foo1 &&
	242	date >foo2 &&
	243	chmod 0 foo2 &&
	244	test_must_fail git add --verbose --no-ignore-errors . &&
	245	! ( git ls-files foo1 \| grep foo1 ) &&
	246	git config add.ignore-errors 0
	247	'
	248	rm -f foo2
dad25e4a	249
6fd1106a	250	test_expect_success BSLASHPSPEC "git add 'fo\\[ou\\]bar' ignores foobar" '
ea335b56	251	git reset --hard &&
8134a003 AR	252	touch fo\[ou\]bar foobar &&
8134a003 AR	253	git add '\''fo\[ou\]bar'\'' &&
87539416	254	git ls-files fo\[ou\]bar \| fgrep fo\[ou\]bar &&
ea335b56 KB	255	! ( git ls-files foobar \| grep foobar )
	256	'
	257
6e4f981f JK	258	test_expect_success 'git add to resolve conflicts on otherwise ignored path' '
	259	git reset --hard &&
	260	H=$(git rev-parse :1/2/a) &&
	261	(
	262	echo "100644 $H 1 track-this"
	263	echo "100644 $H 3 track-this"
	264	) \| git update-index --index-info &&
	265	echo track-this >>.gitignore &&
	266	echo resolved >track-this &&
	267	git add track-this
	268	'
	269
1e7ef746 CP	270	test_expect_success '"add non-existent" should fail' '
	271	test_must_fail git add non-existent &&
	272	! (git ls-files \| grep "non-existent")
	273	'
	274
108da0db JL	275	test_expect_success 'git add --dry-run of existing changed file' "
	276	echo new >>track-this &&
	277	git add --dry-run track-this >actual 2>&1 &&
	278	echo \"add 'track-this'\" \| test_cmp - actual
	279	"
	280
	281	test_expect_success 'git add --dry-run of non-existing file' "
	282	echo ignored-file >>.gitignore &&
48168851 ÆAB	283	test_must_fail git add --dry-run track-this ignored-file >actual 2>&1
	284	"
	285
68b2a005	286	test_expect_success 'git add --dry-run of an existing file output' "
48168851	287	echo \"fatal: pathspec 'ignored-file' did not match any files\" >expect &&
68b2a005	288	test_i18ncmp expect actual
108da0db JL	289	"
108da0db JL	290
c1e02b2b	291	cat >expect.err <<\EOF
108da0db JL	292	The following paths are ignored by one of your .gitignore files:
	293	ignored-file
	294	Use -f if you really want to add them.
	295	fatal: no files added
c1e02b2b JS	296	EOF
c1e02b2b JS	297	cat >expect.out <<\EOF
108da0db JL	298	add 'track-this'
	299	EOF
	300
	301	test_expect_success 'git add --dry-run --ignore-missing of non-existing file' '
439fb829 ÆAB	302	test_must_fail git add --dry-run --ignore-missing track-this ignored-file >actual.out 2>actual.err
	303	'
	304
68b2a005 JH	305	test_expect_success 'git add --dry-run --ignore-missing of non-existing file output' '
	306	test_i18ncmp expect.out actual.out &&
	307	test_i18ncmp expect.err actual.err
108da0db JL	308	'
108da0db JL	309
60ace879	310	test_done