git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
056894eb94b9299f4afe9c06ec4dd22bae1b7ffe blob 6650 bytes (raw)

  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
 
#!/bin/sh

test_description='directory traversal respects user config

This test verifies the traversal of the directory tree when the traversal begins
outside the repository.  Two instances for which this can occur are tested:

	1) The user manually sets the worktree.  For this instance, the test sets
	   the worktree two levels above the `.git` directory and checks whether we
	   are able to add to the index those files that are in either (1) the
	   manually configured worktree directory or (2) the standard worktree
	   location with respect to the `.git` directory (i.e. ensuring that the
	   encountered `.git` directory is not treated as belonging to a foreign
	   nested repository).
	2) The user manually sets the `git_dir` while the working directory is
	   outside the repository.  The test checks that files inside the
	   repository can be added to the index.
	'

. ./test-lib.sh

test_expect_success '1a: setup--config worktree' '
	mkdir test1 &&
	(
	cd test1 &&
	test_create_repo repo &&
	git --git-dir="repo/.git" config core.worktree "$(pwd)" &&

	mkdir -p outside-tracked outside-untracked &&
	mkdir -p repo/inside-tracked repo/inside-untracked &&
	>file-tracked &&
	>file-untracked &&
	>outside-tracked/file &&
	>outside-untracked/file &&
	>repo/file-tracked &&
	>repo/file-untracked &&
	>repo/inside-tracked/file &&
	>repo/inside-untracked/file &&

	cat >expect-tracked-unsorted <<-EOF &&
	../file-tracked
	../outside-tracked/file
	file-tracked
	inside-tracked/file
	EOF

	cat >expect-untracked-unsorted <<-EOF &&
	../file-untracked
	../outside-untracked/file
	file-untracked
	inside-untracked/file
	EOF

	cat >expect-all-dir-unsorted <<-EOF &&
	../file-untracked
	../file-tracked
	../outside-untracked/
	../outside-tracked/
	./
	EOF

	cat expect-tracked-unsorted expect-untracked-unsorted >expect-all-unsorted &&

	cat >.gitignore <<-EOF
	.gitignore
	actual-*
	expect-*
	EOF
	)
'

test_expect_success '1b: pre-add all' '
	(
	cd test1 &&
	local parent_dir="$(pwd)" &&
	(
		cd repo &&
		git ls-files -o --exclude-standard "$parent_dir" >../actual-all-unsorted
	) &&
	sort actual-all-unsorted >actual-all &&
	sort expect-all-unsorted >expect-all &&
	test_cmp expect-all actual-all
	)
'

test_expect_success '1c: pre-add dir all' '
	(
	cd test1 &&
	local parent_dir="$(pwd)" &&
	(
		cd repo &&
		git ls-files -o --directory --exclude-standard "$parent_dir" >../actual-all-dir-unsorted
	) &&
	sort actual-all-dir-unsorted >actual-all &&
	sort expect-all-dir-unsorted >expect-all &&
	test_cmp expect-all actual-all
	)
'

test_expect_success '1d: post-add tracked' '
	(
	cd test1 &&
	local parent_dir="$(pwd)" &&
	(
		cd repo &&
		git add file-tracked &&
		git add inside-tracked &&
		git add ../outside-tracked &&
		git add "$parent_dir/file-tracked" &&
		git ls-files "$parent_dir" >../actual-tracked-unsorted
	) &&
	sort actual-tracked-unsorted >actual-tracked &&
	sort expect-tracked-unsorted >expect-tracked &&
	test_cmp expect-tracked actual-tracked
	)
'

test_expect_success '1e: post-add untracked' '
	(
	cd test1 &&
	local parent_dir="$(pwd)" &&
	(
		cd repo &&
		git ls-files -o --exclude-standard "$parent_dir" >../actual-untracked-unsorted
	) &&
	sort actual-untracked-unsorted >actual-untracked &&
	sort expect-untracked-unsorted >expect-untracked &&
	test_cmp expect-untracked actual-untracked
	)
'

test_expect_success '2a: setup--set git-dir' '
	mkdir test2 &&
	(
	cd test2 &&
	test_create_repo repo &&
	# create two foreign repositories that should remain untracked
	test_create_repo repo-outside &&
	test_create_repo repo/repo-inside &&

	mkdir -p repo/inside-tracked repo/inside-untracked &&
	>repo/file-tracked &&
	>repo/file-untracked &&
	>repo/inside-tracked/file &&
	>repo/inside-untracked/file &&
	>repo-outside/file &&
	>repo/repo-inside/file &&

	cat >expect-tracked-unsorted <<-EOF &&
	repo/file-tracked
	repo/inside-tracked/file
	EOF

	cat >expect-untracked-unsorted <<-EOF &&
	repo/file-untracked
	repo/inside-untracked/file
	repo/repo-inside/
	repo-outside/
	EOF

	cat >expect-all-dir-unsorted <<-EOF &&
	repo/
	repo-outside/
	EOF

	cat expect-tracked-unsorted expect-untracked-unsorted >expect-all-unsorted &&

	cat >.gitignore <<-EOF
	.gitignore
	actual-*
	expect-*
	EOF
	)
'

test_expect_success '2b: pre-add all' '
	(
	cd test2 &&
	git --git-dir=repo/.git ls-files -o --exclude-standard >actual-all-unsorted &&
	sort actual-all-unsorted >actual-all &&
	sort expect-all-unsorted >expect-all &&
	test_cmp expect-all actual-all
	)
'

test_expect_success '2c: pre-add dir all' '
	(
	cd test2 &&
	git --git-dir=repo/.git ls-files -o --directory --exclude-standard >actual-all-dir-unsorted &&
	sort actual-all-dir-unsorted >actual-all &&
	sort expect-all-dir-unsorted >expect-all &&
	test_cmp expect-all actual-all
	)
'

test_expect_success '2d: post-add tracked' '
	(
	cd test2 &&
	git --git-dir=repo/.git add repo/file-tracked &&
	git --git-dir=repo/.git add repo/inside-tracked &&
	git --git-dir=repo/.git ls-files >actual-tracked-unsorted &&
	sort actual-tracked-unsorted >actual-tracked &&
	sort expect-tracked-unsorted >expect-tracked &&
	test_cmp expect-tracked actual-tracked
	)
'

test_expect_success '2e: post-add untracked' '
	(
	cd test2 &&
	git --git-dir=repo/.git ls-files -o --exclude-standard >actual-untracked-unsorted &&
	sort actual-untracked-unsorted >actual-untracked &&
	sort expect-untracked-unsorted >expect-untracked &&
	test_cmp expect-untracked actual-untracked
	)
'

test_expect_success '3a: setup--add repo dir' '
	mkdir test3 &&
	(
	cd test3 &&
	test_create_repo repo &&

	mkdir -p repo/inside-tracked repo/inside-ignored &&
	>repo/file-tracked &&
	>repo/file-ignored &&
	>repo/inside-tracked/file &&
	>repo/inside-ignored/file &&

	cat >.gitignore <<-EOF &&
	.gitignore
	actual-*
	expect-*
	*ignored
	EOF

	cat >expect-tracked-unsorted <<-EOF &&
	repo/file-tracked
	repo/inside-tracked/file
	EOF

	cat >expect-ignored-unsorted <<-EOF
	repo/file-ignored
	repo/inside-ignored/
	.gitignore
	actual-ignored-unsorted
	expect-ignored-unsorted
	expect-tracked-unsorted
	EOF
	)
'

test_expect_success '3b: ignored' '
	(
	cd test3 &&
	git --git-dir=repo/.git ls-files -io --directory --exclude-standard >actual-ignored-unsorted &&
	sort actual-ignored-unsorted >actual-ignored &&
	sort expect-ignored-unsorted >expect-ignored &&
	test_cmp expect-ignored actual-ignored
	)
'

test_expect_success '3c: add repo' '
	(
	cd test3 &&
	git --git-dir=repo/.git add repo &&
	git --git-dir=repo/.git ls-files >actual-tracked-unsorted &&
	sort actual-tracked-unsorted >actual-tracked &&
	sort expect-tracked-unsorted >expect-tracked &&
	test_cmp expect-tracked actual-tracked
	)
'

test_done
debug log:

solving 056894eb94 ...
found 056894eb94 in https://80x24.org/mirrors/git.git

Code repositories for project(s) associated with this 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).