]> git.ipfire.org Git - thirdparty/git.git/blame - t/t1510-repo-setup.sh
t1510: setup case #7
[thirdparty/git.git] / t / t1510-repo-setup.sh
CommitLineData
03a2b6ef
NTND
1#!/bin/sh
2
3test_description='Tests of cwd/prefix/worktree/gitdir setup in all cases'
4
5. ./test-lib.sh
6
7#
8# A few rules for repo setup:
9#
10# 1. GIT_DIR is relative to user's cwd. --git-dir is equivalent to
11# GIT_DIR.
12#
13# 2. .git file is relative to parent directory. .git file is basically
14# symlink in disguise. The directory where .git file points to will
15# become new git_dir.
16#
17# 3. core.worktree is relative to git_dir.
18#
19# 4. GIT_WORK_TREE is relative to user's cwd. --work-tree is
20# equivalent to GIT_WORK_TREE.
21#
22# 5. GIT_WORK_TREE/core.worktree is only effective if GIT_DIR is set
23# Uneffective worktree settings should be warned.
24#
25# 6. Effective GIT_WORK_TREE overrides core.worktree and core.bare
26#
27# 7. Effective core.worktree conflicts with core.bare
28#
29# 8. If GIT_DIR is set but neither worktree nor bare setting is given,
30# original cwd becomes worktree.
31#
32# 9. If .git discovery is done inside a repo, the repo becomes a bare
33# repo. .git discovery is performed if GIT_DIR is not set.
34#
35# 10. If no worktree is available, cwd remains unchanged, prefix is
36# NULL.
37#
38# 11. When user's cwd is outside worktree, cwd remains unchanged,
39# prefix is NULL.
40#
41
42test_repo() {
43 (
fc4045ee
NTND
44 cd "$1" &&
45 if test -n "$2"; then GIT_DIR="$2" && export GIT_DIR; fi &&
46 if test -n "$3"; then GIT_WORK_TREE="$3" && export GIT_WORK_TREE; fi &&
47 rm -f trace &&
03a2b6ef
NTND
48 GIT_TRACE="`pwd`/trace" git symbolic-ref HEAD >/dev/null &&
49 grep '^setup: ' trace >result &&
50 test_cmp expected result
51 )
52}
53
54# Bit 0 = GIT_WORK_TREE
55# Bit 1 = GIT_DIR
56# Bit 2 = core.worktree
57# Bit 3 = .git is a file
58# Bit 4 = bare repo
59# Case# = encoding of the above 5 bits
60
fc4045ee
NTND
61#
62# Case #0
63#
64############################################################
65#
66# Input:
67#
68# - GIT_WORK_TREE is not set
69# - GIT_DIR is not set
70# - core.worktree is not set
71# - .git is a directory
72# - core.bare is not set, cwd is outside .git
73#
74# Output:
75#
76# - worktree is .git's parent directory
77# - cwd is at worktree root dir
78# - prefix is calculated
79# - git_dir is set to ".git"
80# - cwd can't be outside worktree
81
82test_expect_success '#0: setup' '
83 unset GIT_DIR GIT_WORK_TREE &&
84 mkdir 0 0/sub &&
85 cd 0 && git init && cd ..
86'
87
88test_expect_success '#0: at root' '
89 cat >0/expected <<EOF &&
90setup: git_dir: .git
91setup: worktree: $TRASH_DIRECTORY/0
92setup: cwd: $TRASH_DIRECTORY/0
93setup: prefix: (null)
94EOF
95 test_repo 0
96'
97
98test_expect_success '#0: in subdir' '
99 cat >0/sub/expected <<EOF &&
100setup: git_dir: .git
101setup: worktree: $TRASH_DIRECTORY/0
102setup: cwd: $TRASH_DIRECTORY/0
103setup: prefix: sub/
104EOF
105 test_repo 0/sub
106'
107
8fbee484
NTND
108#
109# case #1
110#
111############################################################
112#
113# Input:
114#
115# - GIT_WORK_TREE is set
116# - GIT_DIR is not set
117# - core.worktree is not set
118# - .git is a directory
119# - core.bare is not set, cwd is outside .git
120#
121# Output:
122#
123# GIT_WORK_TREE is ignored -> #0
124
125test_expect_success '#1: setup' '
126 unset GIT_DIR GIT_WORK_TREE &&
127 mkdir 1 1/sub 1.wt 1.wt/sub 1/wt 1/wt/sub &&
128 cd 1 &&
129 git init &&
130 GIT_WORK_TREE=non-existent &&
131 export GIT_WORK_TREE &&
132 cd ..
133'
134
135test_expect_failure '#1: at root' '
136 cat >1/expected <<EOF &&
137setup: git_dir: .git
138setup: worktree: $TRASH_DIRECTORY/1
139setup: cwd: $TRASH_DIRECTORY/1
140setup: prefix: (null)
141EOF
142 test_repo 1
143'
144
145test_expect_failure '#1: in subdir' '
146 cat >1/sub/expected <<EOF &&
147setup: git_dir: .git
148setup: worktree: $TRASH_DIRECTORY/1
149setup: cwd: $TRASH_DIRECTORY/1
150setup: prefix: sub/
151EOF
152 test_repo 1/sub
153'
154
71946602
NTND
155#
156# case #2
157#
158############################################################
159#
160# Input:
161#
162# - GIT_WORK_TREE is not set
163# - GIT_DIR is set
164# - core.worktree is not set
165# - .git is a directory
166# - core.bare is not set, cwd is outside .git
167#
168# Output:
169#
170# - worktree is at original cwd
171# - cwd is unchanged
172# - prefix is NULL
173# - git_dir is set to $GIT_DIR
174# - cwd can't be outside worktree
175
176test_expect_success '#2: setup' '
177 unset GIT_DIR GIT_WORK_TREE &&
178 mkdir 2 2/sub &&
179 cd 2 && git init && cd ..
180'
181
182test_expect_success '#2: at root' '
183 cat >2/expected <<EOF &&
184setup: git_dir: $TRASH_DIRECTORY/2/.git
185setup: worktree: $TRASH_DIRECTORY/2
186setup: cwd: $TRASH_DIRECTORY/2
187setup: prefix: (null)
188EOF
189 test_repo 2 "$TRASH_DIRECTORY/2/.git"
190'
191
192test_expect_success '#2: in subdir' '
193 cat >2/sub/expected <<EOF &&
194setup: git_dir: $TRASH_DIRECTORY/2/.git
195setup: worktree: $TRASH_DIRECTORY/2/sub
196setup: cwd: $TRASH_DIRECTORY/2/sub
197setup: prefix: (null)
198EOF
199 test_repo 2/sub "$TRASH_DIRECTORY/2/.git"
200'
201
202test_expect_success '#2: relative GIT_DIR at root' '
203 cat >2/expected <<EOF &&
204setup: git_dir: .git
205setup: worktree: $TRASH_DIRECTORY/2
206setup: cwd: $TRASH_DIRECTORY/2
207setup: prefix: (null)
208EOF
209 test_repo 2 .git
210'
211
212test_expect_success '#2: relative GIT_DIR in subdir' '
213 cat >2/sub/expected <<EOF &&
214setup: git_dir: ../.git
215setup: worktree: $TRASH_DIRECTORY/2/sub
216setup: cwd: $TRASH_DIRECTORY/2/sub
217setup: prefix: (null)
218EOF
219 test_repo 2/sub ../.git
220'
221
8718ed61
NTND
222#
223# case #3
224#
225############################################################
226#
227# Input:
228#
229# - GIT_WORK_TREE is set
230# - GIT_DIR is set
231# - core.worktree is not set
232# - .git is a directory
233# - core.bare is not set, cwd is outside .git
234#
235# Output:
236#
237# - worktree is set to $GIT_WORK_TREE
238# - cwd is at worktree root
239# - prefix is calculated
240# - git_dir is set to $GIT_DIR
241# - cwd can be outside worktree
242
243test_expect_success '#3: setup' '
244 unset GIT_DIR GIT_WORK_TREE &&
245 mkdir 3 3/sub 3/sub/sub 3.wt 3.wt/sub 3/wt 3/wt/sub &&
246 cd 3 && git init && cd ..
247'
248
249test_expect_success '#3: GIT_DIR(rel), GIT_WORK_TREE=root at root' '
250 cat >3/expected <<EOF &&
251setup: git_dir: .git
252setup: worktree: $TRASH_DIRECTORY/3
253setup: cwd: $TRASH_DIRECTORY/3
254setup: prefix: (null)
255EOF
256 test_repo 3 .git "$TRASH_DIRECTORY/3"
257'
258
259test_expect_success '#3: GIT_DIR(rel), GIT_WORK_TREE=root(rel) at root' '
260 cat >3/expected <<EOF &&
261setup: git_dir: .git
262setup: worktree: $TRASH_DIRECTORY/3
263setup: cwd: $TRASH_DIRECTORY/3
264setup: prefix: (null)
265EOF
266 test_repo 3 .git .
267'
268
269test_expect_success '#3: GIT_DIR, GIT_WORK_TREE=root at root' '
270 cat >3/expected <<EOF &&
271setup: git_dir: $TRASH_DIRECTORY/3/.git
272setup: worktree: $TRASH_DIRECTORY/3
273setup: cwd: $TRASH_DIRECTORY/3
274setup: prefix: (null)
275EOF
276 test_repo 3 "$TRASH_DIRECTORY/3/.git" "$TRASH_DIRECTORY/3"
277'
278
279test_expect_success '#3: GIT_DIR, GIT_WORK_TREE=root(rel) at root' '
280 cat >3/expected <<EOF &&
281setup: git_dir: $TRASH_DIRECTORY/3/.git
282setup: worktree: $TRASH_DIRECTORY/3
283setup: cwd: $TRASH_DIRECTORY/3
284setup: prefix: (null)
285EOF
286 test_repo 3 "$TRASH_DIRECTORY/3/.git" .
287'
288
289test_expect_success '#3: GIT_DIR(rel), GIT_WORKTREE=root in subdir' '
290 cat >3/sub/sub/expected <<EOF &&
291setup: git_dir: $TRASH_DIRECTORY/3/.git
292setup: worktree: $TRASH_DIRECTORY/3
293setup: cwd: $TRASH_DIRECTORY/3
294setup: prefix: sub/sub/
295EOF
296 test_repo 3/sub/sub ../../.git "$TRASH_DIRECTORY/3"
297'
298
299test_expect_success '#3: GIT_DIR(rel), GIT_WORKTREE=root(rel) in subdir' '
300 cat >3/sub/sub/expected <<EOF &&
301setup: git_dir: $TRASH_DIRECTORY/3/.git
302setup: worktree: $TRASH_DIRECTORY/3
303setup: cwd: $TRASH_DIRECTORY/3
304setup: prefix: sub/sub/
305EOF
306 test_repo 3/sub/sub ../../.git ../..
307'
308
309test_expect_success '#3: GIT_DIR, GIT_WORKTREE=root in subdir' '
310 cat >3/sub/expected <<EOF &&
311setup: git_dir: $TRASH_DIRECTORY/3/.git
312setup: worktree: $TRASH_DIRECTORY/3
313setup: cwd: $TRASH_DIRECTORY/3
314setup: prefix: sub/
315EOF
316 test_repo 3/sub "$TRASH_DIRECTORY/3/.git" "$TRASH_DIRECTORY/3"
317'
318
319test_expect_success '#3: GIT_DIR, GIT_WORKTREE=root(rel) in subdir' '
320 cat >3/sub/sub/expected <<EOF &&
321setup: git_dir: $TRASH_DIRECTORY/3/.git
322setup: worktree: $TRASH_DIRECTORY/3
323setup: cwd: $TRASH_DIRECTORY/3
324setup: prefix: sub/sub/
325EOF
326 test_repo 3/sub/sub "$TRASH_DIRECTORY/3/.git" ../..
327'
328
329test_expect_success '#3: GIT_DIR(rel), GIT_WORK_TREE=wt at root' '
330 cat >3/expected <<EOF &&
331setup: git_dir: .git
332setup: worktree: $TRASH_DIRECTORY/3/wt
333setup: cwd: $TRASH_DIRECTORY/3
334setup: prefix: (null)
335EOF
336 test_repo 3 .git "$TRASH_DIRECTORY/3/wt"
337'
338
339test_expect_success '#3: GIT_DIR(rel), GIT_WORK_TREE=wt(rel) at root' '
340 cat >3/expected <<EOF &&
341setup: git_dir: .git
342setup: worktree: $TRASH_DIRECTORY/3/wt
343setup: cwd: $TRASH_DIRECTORY/3
344setup: prefix: (null)
345EOF
346 test_repo 3 .git wt
347'
348
349test_expect_success '#3: GIT_DIR, GIT_WORK_TREE=wt(rel) at root' '
350 cat >3/expected <<EOF &&
351setup: git_dir: $TRASH_DIRECTORY/3/.git
352setup: worktree: $TRASH_DIRECTORY/3/wt
353setup: cwd: $TRASH_DIRECTORY/3
354setup: prefix: (null)
355EOF
356 test_repo 3 "$TRASH_DIRECTORY/3/.git" wt
357'
358
359test_expect_success '#3: GIT_DIR, GIT_WORK_TREE=wt at root' '
360 cat >3/expected <<EOF &&
361setup: git_dir: $TRASH_DIRECTORY/3/.git
362setup: worktree: $TRASH_DIRECTORY/3/wt
363setup: cwd: $TRASH_DIRECTORY/3
364setup: prefix: (null)
365EOF
366 test_repo 3 "$TRASH_DIRECTORY/3/.git" "$TRASH_DIRECTORY/3/wt"
367'
368
369test_expect_success '#3: GIT_DIR(rel), GIT_WORK_TREE=wt in subdir' '
370 cat >3/sub/sub/expected <<EOF &&
371setup: git_dir: ../../.git
372setup: worktree: $TRASH_DIRECTORY/3/wt
373setup: cwd: $TRASH_DIRECTORY/3/sub/sub
374setup: prefix: (null)
375EOF
376 test_repo 3/sub/sub ../../.git "$TRASH_DIRECTORY/3/wt"
377'
378
379test_expect_success '#3: GIT_DIR(rel), GIT_WORK_TREE=wt(rel) in subdir' '
380 cat >3/sub/sub/expected <<EOF &&
381setup: git_dir: ../../.git
382setup: worktree: $TRASH_DIRECTORY/3/wt
383setup: cwd: $TRASH_DIRECTORY/3/sub/sub
384setup: prefix: (null)
385EOF
386 test_repo 3/sub/sub ../../.git ../../wt
387'
388
389test_expect_success '#3: GIT_DIR, GIT_WORK_TREE=wt(rel) in subdir' '
390 cat >3/sub/sub/expected <<EOF &&
391setup: git_dir: $TRASH_DIRECTORY/3/.git
392setup: worktree: $TRASH_DIRECTORY/3/wt
393setup: cwd: $TRASH_DIRECTORY/3/sub/sub
394setup: prefix: (null)
395EOF
396 test_repo 3/sub/sub "$TRASH_DIRECTORY/3/.git" ../../wt
397'
398
399test_expect_success '#3: GIT_DIR, GIT_WORK_TREE=wt in subdir' '
400 cat >3/sub/sub/expected <<EOF &&
401setup: git_dir: $TRASH_DIRECTORY/3/.git
402setup: worktree: $TRASH_DIRECTORY/3/wt
403setup: cwd: $TRASH_DIRECTORY/3/sub/sub
404setup: prefix: (null)
405EOF
406 test_repo 3/sub/sub "$TRASH_DIRECTORY/3/.git" "$TRASH_DIRECTORY/3/wt"
407'
408
409test_expect_success '#3: GIT_DIR(rel), GIT_WORK_TREE=.. at root' '
410 cat >3/expected <<EOF &&
411setup: git_dir: $TRASH_DIRECTORY/3/.git
412setup: worktree: $TRASH_DIRECTORY
413setup: cwd: $TRASH_DIRECTORY
414setup: prefix: 3/
415EOF
416 test_repo 3 .git "$TRASH_DIRECTORY"
417'
418
419test_expect_success '#3: GIT_DIR(rel), GIT_WORK_TREE=..(rel) at root' '
420 cat >3/expected <<EOF &&
421setup: git_dir: $TRASH_DIRECTORY/3/.git
422setup: worktree: $TRASH_DIRECTORY
423setup: cwd: $TRASH_DIRECTORY
424setup: prefix: 3/
425EOF
426 test_repo 3 .git ..
427'
428
429test_expect_success '#3: GIT_DIR, GIT_WORK_TREE=..(rel) at root' '
430 cat >3/expected <<EOF &&
431setup: git_dir: $TRASH_DIRECTORY/3/.git
432setup: worktree: $TRASH_DIRECTORY
433setup: cwd: $TRASH_DIRECTORY
434setup: prefix: 3/
435EOF
436 test_repo 3 "$TRASH_DIRECTORY/3/.git" ..
437'
438
439test_expect_success '#3: GIT_DIR, GIT_WORK_TREE=.. at root' '
440 cat >3/expected <<EOF &&
441setup: git_dir: $TRASH_DIRECTORY/3/.git
442setup: worktree: $TRASH_DIRECTORY
443setup: cwd: $TRASH_DIRECTORY
444setup: prefix: 3/
445EOF
446 test_repo 3 "$TRASH_DIRECTORY/3/.git" "$TRASH_DIRECTORY"
447'
448
449test_expect_success '#3: GIT_DIR(rel), GIT_WORK_TREE=.. in subdir' '
450 cat >3/sub/sub/expected <<EOF &&
451setup: git_dir: $TRASH_DIRECTORY/3/.git
452setup: worktree: $TRASH_DIRECTORY
453setup: cwd: $TRASH_DIRECTORY
454setup: prefix: 3/sub/sub/
455EOF
456 test_repo 3/sub/sub ../../.git "$TRASH_DIRECTORY"
457'
458
459test_expect_success '#3: GIT_DIR(rel), GIT_WORK_TREE=..(rel) in subdir' '
460 cat >3/sub/sub/expected <<EOF &&
461setup: git_dir: $TRASH_DIRECTORY/3/.git
462setup: worktree: $TRASH_DIRECTORY
463setup: cwd: $TRASH_DIRECTORY
464setup: prefix: 3/sub/sub/
465EOF
466 test_repo 3/sub/sub ../../.git ../../..
467'
468
469test_expect_success '#3: GIT_DIR, GIT_WORK_TREE=..(rel) in subdir' '
470 cat >3/sub/sub/expected <<EOF &&
471setup: git_dir: $TRASH_DIRECTORY/3/.git
472setup: worktree: $TRASH_DIRECTORY
473setup: cwd: $TRASH_DIRECTORY
474setup: prefix: 3/sub/sub/
475EOF
476 test_repo 3/sub/sub "$TRASH_DIRECTORY/3/.git" ../../../
477'
478
479test_expect_success '#3: GIT_DIR, GIT_WORK_TREE=.. in subdir' '
480 cat >3/sub/sub/expected <<EOF &&
481setup: git_dir: $TRASH_DIRECTORY/3/.git
482setup: worktree: $TRASH_DIRECTORY
483setup: cwd: $TRASH_DIRECTORY
484setup: prefix: 3/sub/sub/
485EOF
486 test_repo 3/sub/sub "$TRASH_DIRECTORY/3/.git" "$TRASH_DIRECTORY"
487'
488
351fa1dc
NTND
489#
490# case #4
491#
492############################################################
493#
494# Input:
495#
496# - GIT_WORK_TREE is not set
497# - GIT_DIR is not set
498# - core.worktree is set
499# - .git is a directory
500# - core.bare is not set, cwd is outside .git
501#
502# Output:
503#
504# core.worktree is ignored -> #0
505
506test_expect_success '#4: setup' '
507 unset GIT_DIR GIT_WORK_TREE &&
508 mkdir 4 4/sub &&
509 cd 4 &&
510 git init &&
511 git config core.worktree non-existent &&
512 cd ..
513'
514
515test_expect_failure '#4: at root' '
516 cat >4/expected <<EOF &&
517setup: git_dir: .git
518setup: worktree: $TRASH_DIRECTORY/4
519setup: cwd: $TRASH_DIRECTORY/4
520setup: prefix: (null)
521EOF
522 test_repo 4
523'
524
525test_expect_failure '#4: in subdir' '
526 cat >4/sub/expected <<EOF &&
527setup: git_dir: .git
528setup: worktree: $TRASH_DIRECTORY/4
529setup: cwd: $TRASH_DIRECTORY/4
530setup: prefix: sub/
531EOF
532 test_repo 4/sub
533'
534
3f388c17
NTND
535#
536# case #5
537#
538############################################################
539#
540# Input:
541#
542# - GIT_WORK_TREE is set
543# - GIT_DIR is not set
544# - core.worktree is set
545# - .git is a directory
546# - core.bare is not set, cwd is outside .git
547#
548# Output:
549#
550# GIT_WORK_TREE/core.worktree are ignored -> #0
551
552test_expect_success '#5: setup' '
553 unset GIT_DIR GIT_WORK_TREE &&
554 mkdir 5 5/sub &&
555 cd 5 &&
556 git init &&
557 git config core.worktree non-existent &&
558 GIT_WORK_TREE=non-existent-too &&
559 export GIT_WORK_TREE &&
560 cd ..
561'
562
563test_expect_failure '#5: at root' '
564 cat >5/expected <<EOF &&
565setup: git_dir: .git
566setup: worktree: $TRASH_DIRECTORY/5
567setup: cwd: $TRASH_DIRECTORY/5
568setup: prefix: (null)
569EOF
570 test_repo 5
571'
572
573test_expect_failure '#5: in subdir' '
574 cat >5/sub/expected <<EOF &&
575setup: git_dir: .git
576setup: worktree: $TRASH_DIRECTORY/5
577setup: cwd: $TRASH_DIRECTORY/5
578setup: prefix: sub/
579EOF
580 test_repo 5/sub
581'
582
555b96ab
NTND
583#
584# case #6
585#
586############################################################
587#
588# Input:
589#
590# - GIT_WORK_TREE is not set
591# - GIT_DIR is set
592# - core.worktree is set
593# - .git is a directory
594# - core.bare is not set, cwd is outside .git
595#
596# Output:
597#
598# - worktree is at core.worktree
599# - cwd is at worktree root
600# - prefix is calculated
601# - git_dir is at $GIT_DIR
602# - cwd can be outside worktree
603
604test_expect_success '#6: setup' '
605 unset GIT_DIR GIT_WORK_TREE &&
606 mkdir 6 6/sub 6/sub/sub 6.wt 6.wt/sub 6/wt 6/wt/sub &&
607 cd 6 && git init && cd ..
608'
609
610test_expect_success '#6: GIT_DIR(rel), core.worktree=.. at root' '
611 cat >6/expected <<EOF &&
612setup: git_dir: .git
613setup: worktree: $TRASH_DIRECTORY/6
614setup: cwd: $TRASH_DIRECTORY/6
615setup: prefix: (null)
616EOF
617 git config --file="$TRASH_DIRECTORY/6/.git/config" core.worktree "$TRASH_DIRECTORY/6" &&
618 test_repo 6 .git
619'
620
621test_expect_success '#6: GIT_DIR(rel), core.worktree=..(rel) at root' '
622 cat >6/expected <<EOF &&
623setup: git_dir: .git
624setup: worktree: $TRASH_DIRECTORY/6
625setup: cwd: $TRASH_DIRECTORY/6
626setup: prefix: (null)
627EOF
628 git config --file="$TRASH_DIRECTORY/6/.git/config" core.worktree .. &&
629 test_repo 6 .git
630'
631
632test_expect_success '#6: GIT_DIR, core.worktree=.. at root' '
633 cat >6/expected <<EOF &&
634setup: git_dir: $TRASH_DIRECTORY/6/.git
635setup: worktree: $TRASH_DIRECTORY/6
636setup: cwd: $TRASH_DIRECTORY/6
637setup: prefix: (null)
638EOF
639 git config --file="$TRASH_DIRECTORY/6/.git/config" core.worktree "$TRASH_DIRECTORY/6" &&
640 test_repo 6 "$TRASH_DIRECTORY/6/.git"
641'
642
643test_expect_success '#6: GIT_DIR, core.worktree=..(rel) at root' '
644 cat >6/expected <<EOF &&
645setup: git_dir: $TRASH_DIRECTORY/6/.git
646setup: worktree: $TRASH_DIRECTORY/6
647setup: cwd: $TRASH_DIRECTORY/6
648setup: prefix: (null)
649EOF
650 git config --file="$TRASH_DIRECTORY/6/.git/config" core.worktree .. &&
651 test_repo 6 "$TRASH_DIRECTORY/6/.git"
652'
653
654test_expect_failure '#6: GIT_DIR(rel), core.worktree=.. in subdir' '
655 cat >6/sub/sub/expected <<EOF &&
656setup: git_dir: $TRASH_DIRECTORY/6/.git
657setup: worktree: $TRASH_DIRECTORY/6
658setup: cwd: $TRASH_DIRECTORY/6
659setup: prefix: sub/sub/
660EOF
661 git config --file="$TRASH_DIRECTORY/6/.git/config" core.worktree "$TRASH_DIRECTORY/6" &&
662 test_repo 6/sub/sub ../../.git
663'
664
665test_expect_failure '#6: GIT_DIR(rel), core.worktree=..(rel) in subdir' '
666 cat >6/sub/sub/expected <<EOF &&
667setup: git_dir: $TRASH_DIRECTORY/6/.git
668setup: worktree: $TRASH_DIRECTORY/6
669setup: cwd: $TRASH_DIRECTORY/6
670setup: prefix: sub/sub/
671EOF
672 git config --file="$TRASH_DIRECTORY/6/.git/config" core.worktree .. &&
673 test_repo 6/sub/sub ../../.git
674'
675
676test_expect_success '#6: GIT_DIR, core.worktree=.. in subdir' '
677 cat >6/sub/expected <<EOF &&
678setup: git_dir: $TRASH_DIRECTORY/6/.git
679setup: worktree: $TRASH_DIRECTORY/6
680setup: cwd: $TRASH_DIRECTORY/6
681setup: prefix: sub/
682EOF
683 git config --file="$TRASH_DIRECTORY/6/.git/config" core.worktree "$TRASH_DIRECTORY/6" &&
684 test_repo 6/sub "$TRASH_DIRECTORY/6/.git"
685'
686
687test_expect_success '#6: GIT_DIR, core.worktree=..(rel) in subdir' '
688 cat >6/sub/sub/expected <<EOF &&
689setup: git_dir: $TRASH_DIRECTORY/6/.git
690setup: worktree: $TRASH_DIRECTORY/6
691setup: cwd: $TRASH_DIRECTORY/6
692setup: prefix: sub/sub/
693EOF
694 git config --file="$TRASH_DIRECTORY/6/.git/config" core.worktree .. &&
695 test_repo 6/sub/sub "$TRASH_DIRECTORY/6/.git"
696'
697
698test_expect_success '#6: GIT_DIR(rel), core.worktree=../wt at root' '
699 cat >6/expected <<EOF &&
700setup: git_dir: .git
701setup: worktree: $TRASH_DIRECTORY/6/wt
702setup: cwd: $TRASH_DIRECTORY/6
703setup: prefix: (null)
704EOF
705 git config --file="$TRASH_DIRECTORY/6/.git/config" core.worktree "$TRASH_DIRECTORY/6/wt" &&
706 test_repo 6 .git
707'
708
709test_expect_success '#6: GIT_DIR(rel), core.worktree=../wt(rel) at root' '
710 cat >6/expected <<EOF &&
711setup: git_dir: .git
712setup: worktree: $TRASH_DIRECTORY/6/wt
713setup: cwd: $TRASH_DIRECTORY/6
714setup: prefix: (null)
715EOF
716 git config --file="$TRASH_DIRECTORY/6/.git/config" core.worktree ../wt &&
717 test_repo 6 .git
718'
719
720test_expect_success '#6: GIT_DIR, core.worktree=../wt(rel) at root' '
721 cat >6/expected <<EOF &&
722setup: git_dir: $TRASH_DIRECTORY/6/.git
723setup: worktree: $TRASH_DIRECTORY/6/wt
724setup: cwd: $TRASH_DIRECTORY/6
725setup: prefix: (null)
726EOF
727 git config --file="$TRASH_DIRECTORY/6/.git/config" core.worktree ../wt &&
728 test_repo 6 "$TRASH_DIRECTORY/6/.git"
729'
730
731test_expect_success '#6: GIT_DIR, core.worktree=../wt at root' '
732 cat >6/expected <<EOF &&
733setup: git_dir: $TRASH_DIRECTORY/6/.git
734setup: worktree: $TRASH_DIRECTORY/6/wt
735setup: cwd: $TRASH_DIRECTORY/6
736setup: prefix: (null)
737EOF
738 git config --file="$TRASH_DIRECTORY/6/.git/config" core.worktree "$TRASH_DIRECTORY/6/wt" &&
739 test_repo 6 "$TRASH_DIRECTORY/6/.git"
740'
741
742test_expect_success '#6: GIT_DIR(rel), core.worktree=../wt in subdir' '
743 cat >6/sub/sub/expected <<EOF &&
744setup: git_dir: ../../.git
745setup: worktree: $TRASH_DIRECTORY/6/wt
746setup: cwd: $TRASH_DIRECTORY/6/sub/sub
747setup: prefix: (null)
748EOF
749 git config --file="$TRASH_DIRECTORY/6/.git/config" core.worktree "$TRASH_DIRECTORY/6/wt" &&
750 test_repo 6/sub/sub ../../.git
751'
752
753test_expect_success '#6: GIT_DIR(rel), core.worktree=../wt(rel) in subdir' '
754 cat >6/sub/sub/expected <<EOF &&
755setup: git_dir: ../../.git
756setup: worktree: $TRASH_DIRECTORY/6/wt
757setup: cwd: $TRASH_DIRECTORY/6/sub/sub
758setup: prefix: (null)
759EOF
760 git config --file="$TRASH_DIRECTORY/6/.git/config" core.worktree ../wt &&
761 test_repo 6/sub/sub ../../.git
762'
763
764test_expect_success '#6: GIT_DIR, core.worktree=../wt(rel) in subdir' '
765 cat >6/sub/sub/expected <<EOF &&
766setup: git_dir: $TRASH_DIRECTORY/6/.git
767setup: worktree: $TRASH_DIRECTORY/6/wt
768setup: cwd: $TRASH_DIRECTORY/6/sub/sub
769setup: prefix: (null)
770EOF
771 git config --file="$TRASH_DIRECTORY/6/.git/config" core.worktree ../wt &&
772 test_repo 6/sub/sub "$TRASH_DIRECTORY/6/.git"
773'
774
775test_expect_success '#6: GIT_DIR, core.worktree=../wt in subdir' '
776 cat >6/sub/sub/expected <<EOF &&
777setup: git_dir: $TRASH_DIRECTORY/6/.git
778setup: worktree: $TRASH_DIRECTORY/6/wt
779setup: cwd: $TRASH_DIRECTORY/6/sub/sub
780setup: prefix: (null)
781EOF
782 git config --file="$TRASH_DIRECTORY/6/.git/config" core.worktree "$TRASH_DIRECTORY/6/wt" &&
783 test_repo 6/sub/sub "$TRASH_DIRECTORY/6/.git"
784'
785
786test_expect_failure '#6: GIT_DIR(rel), core.worktree=../.. at root' '
787 cat >6/expected <<EOF &&
788setup: git_dir: $TRASH_DIRECTORY/6/.git
789setup: worktree: $TRASH_DIRECTORY
790setup: cwd: $TRASH_DIRECTORY
791setup: prefix: 6/
792EOF
793 git config --file="$TRASH_DIRECTORY/6/.git/config" core.worktree "$TRASH_DIRECTORY" &&
794 test_repo 6 .git
795'
796
797test_expect_failure '#6: GIT_DIR(rel), core.worktree=../..(rel) at root' '
798 cat >6/expected <<EOF &&
799setup: git_dir: $TRASH_DIRECTORY/6/.git
800setup: worktree: $TRASH_DIRECTORY
801setup: cwd: $TRASH_DIRECTORY
802setup: prefix: 6/
803EOF
804 git config --file="$TRASH_DIRECTORY/6/.git/config" core.worktree ../../ &&
805 test_repo 6 .git
806'
807
808test_expect_success '#6: GIT_DIR, core.worktree=../..(rel) at root' '
809 cat >6/expected <<EOF &&
810setup: git_dir: $TRASH_DIRECTORY/6/.git
811setup: worktree: $TRASH_DIRECTORY
812setup: cwd: $TRASH_DIRECTORY
813setup: prefix: 6/
814EOF
815 git config --file="$TRASH_DIRECTORY/6/.git/config" core.worktree ../../ &&
816 test_repo 6 "$TRASH_DIRECTORY/6/.git"
817'
818
819test_expect_success '#6: GIT_DIR, core.worktree=../.. at root' '
820 cat >6/expected <<EOF &&
821setup: git_dir: $TRASH_DIRECTORY/6/.git
822setup: worktree: $TRASH_DIRECTORY
823setup: cwd: $TRASH_DIRECTORY
824setup: prefix: 6/
825EOF
826 git config --file="$TRASH_DIRECTORY/6/.git/config" core.worktree "$TRASH_DIRECTORY" &&
827 test_repo 6 "$TRASH_DIRECTORY/6/.git"
828'
829
830test_expect_failure '#6: GIT_DIR(rel), core.worktree=../.. in subdir' '
831 cat >6/sub/sub/expected <<EOF &&
832setup: git_dir: $TRASH_DIRECTORY/6/.git
833setup: worktree: $TRASH_DIRECTORY
834setup: cwd: $TRASH_DIRECTORY
835setup: prefix: 6/sub/sub/
836EOF
837 git config --file="$TRASH_DIRECTORY/6/.git/config" core.worktree "$TRASH_DIRECTORY" &&
838 test_repo 6/sub/sub ../../.git
839'
840
841test_expect_failure '#6: GIT_DIR(rel), core.worktree=../..(rel) in subdir' '
842 cat >6/sub/sub/expected <<EOF &&
843setup: git_dir: $TRASH_DIRECTORY/6/.git
844setup: worktree: $TRASH_DIRECTORY
845setup: cwd: $TRASH_DIRECTORY
846setup: prefix: 6/sub/sub/
847EOF
848 git config --file="$TRASH_DIRECTORY/6/.git/config" core.worktree ../.. &&
849 test_repo 6/sub/sub ../../.git
850'
851
852test_expect_success '#6: GIT_DIR, core.worktree=../..(rel) in subdir' '
853 cat >6/sub/sub/expected <<EOF &&
854setup: git_dir: $TRASH_DIRECTORY/6/.git
855setup: worktree: $TRASH_DIRECTORY
856setup: cwd: $TRASH_DIRECTORY
857setup: prefix: 6/sub/sub/
858EOF
859 git config --file="$TRASH_DIRECTORY/6/.git/config" core.worktree ../.. &&
860 test_repo 6/sub/sub "$TRASH_DIRECTORY/6/.git"
861'
862
863test_expect_success '#6: GIT_DIR, core.worktree=../.. in subdir' '
864 cat >6/sub/sub/expected <<EOF &&
865setup: git_dir: $TRASH_DIRECTORY/6/.git
866setup: worktree: $TRASH_DIRECTORY
867setup: cwd: $TRASH_DIRECTORY
868setup: prefix: 6/sub/sub/
869EOF
870 git config --file="$TRASH_DIRECTORY/6/.git/config" core.worktree "$TRASH_DIRECTORY" &&
871 test_repo 6/sub/sub "$TRASH_DIRECTORY/6/.git"
872'
873
561a7e66
NTND
874#
875# case #7
876#
877############################################################
878#
879# Input:
880#
881# - GIT_WORK_TREE is set
882# - GIT_DIR is set
883# - core.worktree is set
884# - .git is a directory
885# - core.bare is not set, cwd is outside .git
886#
887# Output:
888#
889# core.worktree is overridden by GIT_WORK_TREE -> #3
890
891test_expect_success '#7: setup' '
892 unset GIT_DIR GIT_WORK_TREE &&
893 mkdir 7 7/sub 7/sub/sub 7.wt 7.wt/sub 7/wt 7/wt/sub &&
894 cd 7 &&
895 git init &&
896 git config core.worktree non-existent &&
897 cd ..
898'
899
900test_expect_success '#7: GIT_DIR(rel), GIT_WORK_TREE=root at root' '
901 cat >7/expected <<EOF &&
902setup: git_dir: .git
903setup: worktree: $TRASH_DIRECTORY/7
904setup: cwd: $TRASH_DIRECTORY/7
905setup: prefix: (null)
906EOF
907 test_repo 7 .git "$TRASH_DIRECTORY/7"
908'
909
910test_expect_success '#7: GIT_DIR(rel), GIT_WORK_TREE=root(rel) at root' '
911 cat >7/expected <<EOF &&
912setup: git_dir: .git
913setup: worktree: $TRASH_DIRECTORY/7
914setup: cwd: $TRASH_DIRECTORY/7
915setup: prefix: (null)
916EOF
917 test_repo 7 .git .
918'
919
920test_expect_success '#7: GIT_DIR, GIT_WORK_TREE=root at root' '
921 cat >7/expected <<EOF &&
922setup: git_dir: $TRASH_DIRECTORY/7/.git
923setup: worktree: $TRASH_DIRECTORY/7
924setup: cwd: $TRASH_DIRECTORY/7
925setup: prefix: (null)
926EOF
927 test_repo 7 "$TRASH_DIRECTORY/7/.git" "$TRASH_DIRECTORY/7"
928'
929
930test_expect_success '#7: GIT_DIR, GIT_WORK_TREE=root(rel) at root' '
931 cat >7/expected <<EOF &&
932setup: git_dir: $TRASH_DIRECTORY/7/.git
933setup: worktree: $TRASH_DIRECTORY/7
934setup: cwd: $TRASH_DIRECTORY/7
935setup: prefix: (null)
936EOF
937 test_repo 7 "$TRASH_DIRECTORY/7/.git" .
938'
939
940test_expect_success '#7: GIT_DIR(rel), GIT_WORKTREE=root in subdir' '
941 cat >7/sub/sub/expected <<EOF &&
942setup: git_dir: $TRASH_DIRECTORY/7/.git
943setup: worktree: $TRASH_DIRECTORY/7
944setup: cwd: $TRASH_DIRECTORY/7
945setup: prefix: sub/sub/
946EOF
947 test_repo 7/sub/sub ../../.git "$TRASH_DIRECTORY/7"
948'
949
950test_expect_success '#7: GIT_DIR(rel), GIT_WORKTREE=root(rel) in subdir' '
951 cat >7/sub/sub/expected <<EOF &&
952setup: git_dir: $TRASH_DIRECTORY/7/.git
953setup: worktree: $TRASH_DIRECTORY/7
954setup: cwd: $TRASH_DIRECTORY/7
955setup: prefix: sub/sub/
956EOF
957 test_repo 7/sub/sub ../../.git ../..
958'
959
960test_expect_success '#7: GIT_DIR, GIT_WORKTREE=root in subdir' '
961 cat >7/sub/expected <<EOF &&
962setup: git_dir: $TRASH_DIRECTORY/7/.git
963setup: worktree: $TRASH_DIRECTORY/7
964setup: cwd: $TRASH_DIRECTORY/7
965setup: prefix: sub/
966EOF
967 test_repo 7/sub "$TRASH_DIRECTORY/7/.git" "$TRASH_DIRECTORY/7"
968'
969
970test_expect_success '#7: GIT_DIR, GIT_WORKTREE=root(rel) in subdir' '
971 cat >7/sub/sub/expected <<EOF &&
972setup: git_dir: $TRASH_DIRECTORY/7/.git
973setup: worktree: $TRASH_DIRECTORY/7
974setup: cwd: $TRASH_DIRECTORY/7
975setup: prefix: sub/sub/
976EOF
977 test_repo 7/sub/sub "$TRASH_DIRECTORY/7/.git" ../..
978'
979
980test_expect_success '#7: GIT_DIR(rel), GIT_WORK_TREE=wt at root' '
981 cat >7/expected <<EOF &&
982setup: git_dir: .git
983setup: worktree: $TRASH_DIRECTORY/7/wt
984setup: cwd: $TRASH_DIRECTORY/7
985setup: prefix: (null)
986EOF
987 test_repo 7 .git "$TRASH_DIRECTORY/7/wt"
988'
989
990test_expect_success '#7: GIT_DIR(rel), GIT_WORK_TREE=wt(rel) at root' '
991 cat >7/expected <<EOF &&
992setup: git_dir: .git
993setup: worktree: $TRASH_DIRECTORY/7/wt
994setup: cwd: $TRASH_DIRECTORY/7
995setup: prefix: (null)
996EOF
997 test_repo 7 .git wt
998'
999
1000test_expect_success '#7: GIT_DIR, GIT_WORK_TREE=wt(rel) at root' '
1001 cat >7/expected <<EOF &&
1002setup: git_dir: $TRASH_DIRECTORY/7/.git
1003setup: worktree: $TRASH_DIRECTORY/7/wt
1004setup: cwd: $TRASH_DIRECTORY/7
1005setup: prefix: (null)
1006EOF
1007 test_repo 7 "$TRASH_DIRECTORY/7/.git" wt
1008'
1009
1010test_expect_success '#7: GIT_DIR, GIT_WORK_TREE=wt at root' '
1011 cat >7/expected <<EOF &&
1012setup: git_dir: $TRASH_DIRECTORY/7/.git
1013setup: worktree: $TRASH_DIRECTORY/7/wt
1014setup: cwd: $TRASH_DIRECTORY/7
1015setup: prefix: (null)
1016EOF
1017 test_repo 7 "$TRASH_DIRECTORY/7/.git" "$TRASH_DIRECTORY/7/wt"
1018'
1019
1020test_expect_success '#7: GIT_DIR(rel), GIT_WORK_TREE=wt in subdir' '
1021 cat >7/sub/sub/expected <<EOF &&
1022setup: git_dir: ../../.git
1023setup: worktree: $TRASH_DIRECTORY/7/wt
1024setup: cwd: $TRASH_DIRECTORY/7/sub/sub
1025setup: prefix: (null)
1026EOF
1027 test_repo 7/sub/sub ../../.git "$TRASH_DIRECTORY/7/wt"
1028'
1029
1030test_expect_success '#7: GIT_DIR(rel), GIT_WORK_TREE=wt(rel) in subdir' '
1031 cat >7/sub/sub/expected <<EOF &&
1032setup: git_dir: ../../.git
1033setup: worktree: $TRASH_DIRECTORY/7/wt
1034setup: cwd: $TRASH_DIRECTORY/7/sub/sub
1035setup: prefix: (null)
1036EOF
1037 test_repo 7/sub/sub ../../.git ../../wt
1038'
1039
1040test_expect_success '#7: GIT_DIR, GIT_WORK_TREE=wt(rel) in subdir' '
1041 cat >7/sub/sub/expected <<EOF &&
1042setup: git_dir: $TRASH_DIRECTORY/7/.git
1043setup: worktree: $TRASH_DIRECTORY/7/wt
1044setup: cwd: $TRASH_DIRECTORY/7/sub/sub
1045setup: prefix: (null)
1046EOF
1047 test_repo 7/sub/sub "$TRASH_DIRECTORY/7/.git" ../../wt
1048'
1049
1050test_expect_success '#7: GIT_DIR, GIT_WORK_TREE=wt in subdir' '
1051 cat >7/sub/sub/expected <<EOF &&
1052setup: git_dir: $TRASH_DIRECTORY/7/.git
1053setup: worktree: $TRASH_DIRECTORY/7/wt
1054setup: cwd: $TRASH_DIRECTORY/7/sub/sub
1055setup: prefix: (null)
1056EOF
1057 test_repo 7/sub/sub "$TRASH_DIRECTORY/7/.git" "$TRASH_DIRECTORY/7/wt"
1058'
1059
1060test_expect_success '#7: GIT_DIR(rel), GIT_WORK_TREE=.. at root' '
1061 cat >7/expected <<EOF &&
1062setup: git_dir: $TRASH_DIRECTORY/7/.git
1063setup: worktree: $TRASH_DIRECTORY
1064setup: cwd: $TRASH_DIRECTORY
1065setup: prefix: 7/
1066EOF
1067 test_repo 7 .git "$TRASH_DIRECTORY"
1068'
1069
1070test_expect_success '#7: GIT_DIR(rel), GIT_WORK_TREE=..(rel) at root' '
1071 cat >7/expected <<EOF &&
1072setup: git_dir: $TRASH_DIRECTORY/7/.git
1073setup: worktree: $TRASH_DIRECTORY
1074setup: cwd: $TRASH_DIRECTORY
1075setup: prefix: 7/
1076EOF
1077 test_repo 7 .git ..
1078'
1079
1080test_expect_success '#7: GIT_DIR, GIT_WORK_TREE=..(rel) at root' '
1081 cat >7/expected <<EOF &&
1082setup: git_dir: $TRASH_DIRECTORY/7/.git
1083setup: worktree: $TRASH_DIRECTORY
1084setup: cwd: $TRASH_DIRECTORY
1085setup: prefix: 7/
1086EOF
1087 test_repo 7 "$TRASH_DIRECTORY/7/.git" ..
1088'
1089
1090test_expect_success '#7: GIT_DIR, GIT_WORK_TREE=.. at root' '
1091 cat >7/expected <<EOF &&
1092setup: git_dir: $TRASH_DIRECTORY/7/.git
1093setup: worktree: $TRASH_DIRECTORY
1094setup: cwd: $TRASH_DIRECTORY
1095setup: prefix: 7/
1096EOF
1097 test_repo 7 "$TRASH_DIRECTORY/7/.git" "$TRASH_DIRECTORY"
1098'
1099
1100test_expect_success '#7: GIT_DIR(rel), GIT_WORK_TREE=.. in subdir' '
1101 cat >7/sub/sub/expected <<EOF &&
1102setup: git_dir: $TRASH_DIRECTORY/7/.git
1103setup: worktree: $TRASH_DIRECTORY
1104setup: cwd: $TRASH_DIRECTORY
1105setup: prefix: 7/sub/sub/
1106EOF
1107 test_repo 7/sub/sub ../../.git "$TRASH_DIRECTORY"
1108'
1109
1110test_expect_success '#7: GIT_DIR(rel), GIT_WORK_TREE=..(rel) in subdir' '
1111 cat >7/sub/sub/expected <<EOF &&
1112setup: git_dir: $TRASH_DIRECTORY/7/.git
1113setup: worktree: $TRASH_DIRECTORY
1114setup: cwd: $TRASH_DIRECTORY
1115setup: prefix: 7/sub/sub/
1116EOF
1117 test_repo 7/sub/sub ../../.git ../../..
1118'
1119
1120test_expect_success '#7: GIT_DIR, GIT_WORK_TREE=..(rel) in subdir' '
1121 cat >7/sub/sub/expected <<EOF &&
1122setup: git_dir: $TRASH_DIRECTORY/7/.git
1123setup: worktree: $TRASH_DIRECTORY
1124setup: cwd: $TRASH_DIRECTORY
1125setup: prefix: 7/sub/sub/
1126EOF
1127 test_repo 7/sub/sub "$TRASH_DIRECTORY/7/.git" ../../../
1128'
1129
1130test_expect_success '#7: GIT_DIR, GIT_WORK_TREE=.. in subdir' '
1131 cat >7/sub/sub/expected <<EOF &&
1132setup: git_dir: $TRASH_DIRECTORY/7/.git
1133setup: worktree: $TRASH_DIRECTORY
1134setup: cwd: $TRASH_DIRECTORY
1135setup: prefix: 7/sub/sub/
1136EOF
1137 test_repo 7/sub/sub "$TRASH_DIRECTORY/7/.git" "$TRASH_DIRECTORY"
1138'
1139
03a2b6ef 1140test_done