blob: 74750b8d4cecd281bb7ec54bddc4a7f7ff9818b1 (
plain)
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
|
#!/bin/sh
test_description='Tests of cwd/prefix/worktree/gitdir setup in all cases'
. ./test-lib.sh
#
# A few rules for repo setup:
#
# 1. GIT_DIR is relative to user's cwd. --git-dir is equivalent to
# GIT_DIR.
#
# 2. .git file is relative to parent directory. .git file is basically
# symlink in disguise. The directory where .git file points to will
# become new git_dir.
#
# 3. core.worktree is relative to git_dir.
#
# 4. GIT_WORK_TREE is relative to user's cwd. --work-tree is
# equivalent to GIT_WORK_TREE.
#
# 5. GIT_WORK_TREE/core.worktree is only effective if GIT_DIR is set
# Uneffective worktree settings should be warned.
#
# 6. Effective GIT_WORK_TREE overrides core.worktree and core.bare
#
# 7. Effective core.worktree conflicts with core.bare
#
# 8. If GIT_DIR is set but neither worktree nor bare setting is given,
# original cwd becomes worktree.
#
# 9. If .git discovery is done inside a repo, the repo becomes a bare
# repo. .git discovery is performed if GIT_DIR is not set.
#
# 10. If no worktree is available, cwd remains unchanged, prefix is
# NULL.
#
# 11. When user's cwd is outside worktree, cwd remains unchanged,
# prefix is NULL.
#
test_repo() {
(
cd "$1" &&
if test -n "$2"; then GIT_DIR="$2" && export GIT_DIR; fi &&
if test -n "$3"; then GIT_WORK_TREE="$3" && export GIT_WORK_TREE; fi &&
rm -f trace &&
GIT_TRACE="`pwd`/trace" git symbolic-ref HEAD >/dev/null &&
grep '^setup: ' trace >result &&
test_cmp expected result
)
}
# Bit 0 = GIT_WORK_TREE
# Bit 1 = GIT_DIR
# Bit 2 = core.worktree
# Bit 3 = .git is a file
# Bit 4 = bare repo
# Case# = encoding of the above 5 bits
#
# Case #0
#
############################################################
#
# Input:
#
# - GIT_WORK_TREE is not set
# - GIT_DIR is not set
# - core.worktree is not set
# - .git is a directory
# - core.bare is not set, cwd is outside .git
#
# Output:
#
# - worktree is .git's parent directory
# - cwd is at worktree root dir
# - prefix is calculated
# - git_dir is set to ".git"
# - cwd can't be outside worktree
test_expect_success '#0: setup' '
unset GIT_DIR GIT_WORK_TREE &&
mkdir 0 0/sub &&
cd 0 && git init && cd ..
'
test_expect_success '#0: at root' '
cat >0/expected <<EOF &&
setup: git_dir: .git
setup: worktree: $TRASH_DIRECTORY/0
setup: cwd: $TRASH_DIRECTORY/0
setup: prefix: (null)
EOF
test_repo 0
'
test_expect_success '#0: in subdir' '
cat >0/sub/expected <<EOF &&
setup: git_dir: .git
setup: worktree: $TRASH_DIRECTORY/0
setup: cwd: $TRASH_DIRECTORY/0
setup: prefix: sub/
EOF
test_repo 0/sub
'
#
# case #1
#
############################################################
#
# Input:
#
# - GIT_WORK_TREE is set
# - GIT_DIR is not set
# - core.worktree is not set
# - .git is a directory
# - core.bare is not set, cwd is outside .git
#
# Output:
#
# GIT_WORK_TREE is ignored -> #0
test_expect_success '#1: setup' '
unset GIT_DIR GIT_WORK_TREE &&
mkdir 1 1/sub 1.wt 1.wt/sub 1/wt 1/wt/sub &&
cd 1 &&
git init &&
GIT_WORK_TREE=non-existent &&
export GIT_WORK_TREE &&
cd ..
'
test_expect_failure '#1: at root' '
cat >1/expected <<EOF &&
setup: git_dir: .git
setup: worktree: $TRASH_DIRECTORY/1
setup: cwd: $TRASH_DIRECTORY/1
setup: prefix: (null)
EOF
test_repo 1
'
test_expect_failure '#1: in subdir' '
cat >1/sub/expected <<EOF &&
setup: git_dir: .git
setup: worktree: $TRASH_DIRECTORY/1
setup: cwd: $TRASH_DIRECTORY/1
setup: prefix: sub/
EOF
test_repo 1/sub
'
#
# case #2
#
############################################################
#
# Input:
#
# - GIT_WORK_TREE is not set
# - GIT_DIR is set
# - core.worktree is not set
# - .git is a directory
# - core.bare is not set, cwd is outside .git
#
# Output:
#
# - worktree is at original cwd
# - cwd is unchanged
# - prefix is NULL
# - git_dir is set to $GIT_DIR
# - cwd can't be outside worktree
test_expect_success '#2: setup' '
unset GIT_DIR GIT_WORK_TREE &&
mkdir 2 2/sub &&
cd 2 && git init && cd ..
'
test_expect_success '#2: at root' '
cat >2/expected <<EOF &&
setup: git_dir: $TRASH_DIRECTORY/2/.git
setup: worktree: $TRASH_DIRECTORY/2
setup: cwd: $TRASH_DIRECTORY/2
setup: prefix: (null)
EOF
test_repo 2 "$TRASH_DIRECTORY/2/.git"
'
test_expect_success '#2: in subdir' '
cat >2/sub/expected <<EOF &&
setup: git_dir: $TRASH_DIRECTORY/2/.git
setup: worktree: $TRASH_DIRECTORY/2/sub
setup: cwd: $TRASH_DIRECTORY/2/sub
setup: prefix: (null)
EOF
test_repo 2/sub "$TRASH_DIRECTORY/2/.git"
'
test_expect_success '#2: relative GIT_DIR at root' '
cat >2/expected <<EOF &&
setup: git_dir: .git
setup: worktree: $TRASH_DIRECTORY/2
setup: cwd: $TRASH_DIRECTORY/2
setup: prefix: (null)
EOF
test_repo 2 .git
'
test_expect_success '#2: relative GIT_DIR in subdir' '
cat >2/sub/expected <<EOF &&
setup: git_dir: ../.git
setup: worktree: $TRASH_DIRECTORY/2/sub
setup: cwd: $TRASH_DIRECTORY/2/sub
setup: prefix: (null)
EOF
test_repo 2/sub ../.git
'
test_done
|