forked from eacousineau/util
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathgit-new-workdir.sh
executable file
·325 lines (288 loc) · 8.16 KB
/
git-new-workdir.sh
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
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
#!/bin/sh
# update-head - How to update to a detached head?
bin_path=$0
bin=$(basename $bin_path)
# See `git-repack`
OPTIONS_SPEC="\
git-new-workdir [options] <repository> <new_workdir> [<commit>]
git-new-workdir --show-orig <repository>
--
bare checkout as a bare git repository
link-head link 'HEAD' file as well (useful for tracking stuff as submodules)
no-checkout don't checkout the files (useful for submodules)
Management
show-orig print original repo's directory
update-config replace workdir's config with original's config
update-head replace workdir's HEAD with original's HEAD (since it can be made a symlink).\
Note that this does not update the repo's index nor tree. Use 'git reset HEAD' or 'git checkout -f HEAD' to resolve that.
Submodules
always-link-config link 'config' file, even if using on a submodule.\
Otherwise, a copy of the config is made.
c,constrain use git-config scm.focusGroup (submodule-ext) to checkout selected submodules
ignore-submodules do not try to checkout submodules
"
# How to get this to show up in basic help? It seems to be either option spec or long usage....
LONG_USAGE='Checkout a branch / commit of an existing Git repository to a new location,
linking to the original object database, refs, config (if not a supermodule), etc., so
that the git database is the same between the original Git repository and the new
working directory.'
NONGIT_OK=1
export PATH=$PATH:$(git --exec-path) # Put git libexec on path
. git-sh-setup
always_link_config=
bare=
ignore_submodules=
constrain=
link_head=
show_orig=
update_config=
update_head=
no_checkout=
while test $# -gt 0
do
case "$1" in
--always-link-config)
always_link_config=1;;
--bare)
bare=1;;
--ignore-submodules)
ignore_submodules=1;;
-c|--constrain)
constrain=1;;
--link-head)
link_head=1;;
--show-orig)
show_orig=1;;
--update-config)
update_config=1;;
--update-head)
update_head=1;;
--no-checkout)
no_checkout=1;;
--) shift; break;;
*) usage;;
esac
shift
done
get_git_dir()
{
( cd $1 && git rev-parse --git-dir ) 2>/dev/null
}
get_orig_gitdir()
{
# want to make sure that what is pointed to has a .git directory ...
orig_gitdir=$(get_git_dir "$orig_workdir") || die "Not a git repository: \"$orig_workdir\""
# make sure the links use full paths
case "$orig_gitdir" in
.git)
orig_gitdir="$orig_workdir/.git"
;;
.)
orig_gitdir=$orig_workdir
;;
esac
orig_gitdir=$(readlink -f $orig_gitdir)
}
get_new_gitdir()
{
if test -z "$bare"
then
new_gitdir="$new_workdir/.git"
else
new_gitdir="$new_workdir"
fi
}
git_dir_check_hack()
{
( cd $1 && test -e HEAD -a -e config -a -d refs )
}
copy_config()
{
x=config
orig_config="$orig_gitdir/$x"
new_config="$new_gitdir/$x"
# Allow submodules to be checked out
if test -z "$always_link_config" && git config -f "$orig_config" core.worktree > /dev/null
then
echo "\t[ Note ] Copying .git/config and unsetting core.worktree"
cp "$orig_gitdir/$x" "$new_config"
git config -f "$new_config" --unset core.worktree
else
ln -s "$orig_config" "$new_config"
fi
}
if test -n "$always_link_config"
then
recurse_flags="--always-link-config"
fi
# TODO Make first argument just 'workdir', and later assign it to orig workdir?
orig_workdir=$1
get_orig_gitdir
if test -n "$show_orig"
then
cd $orig_gitdir
test -h "$orig_gitdir/refs" || die "'$orig_workdir' is not a new workdir (just a Git repo?)"
if test -e orig_workdir
then
cat orig_workdir
else
real_gitdir=$(dirname $(readlink -f $orig_gitdir/refs))
cd $real_gitdir
workdir=$(git rev-parse --show-toplevel)
if test -z "$workdir"
then
# Just try to go up a directory
echo "WARNING: Could not get --show-toplevel to work. Just going to guess it's up a directory." >&2
cd .. && workdir="$PWD"
fi
echo "$workdir"
fi
return 0
fi
resolve_orig_gitdir()
{
# Crappy function names, bad names...
new_workdir="$orig_workdir"
get_new_gitdir
orig_workdir="$(git-new-workdir --show-orig $orig_workdir)" || exit $?
get_orig_gitdir
}
if test -n "$update_config"
then
resolve_orig_gitdir
if test -h "$new_gitdir/config"
then
echo "config is already a symlink, no need to update"
else
rm -f "$new_gitdir/config"
# Need to move HEAD so that Git doesn't complain about worktree stuff???
mv "$new_gitdir/HEAD" "$new_gitdir/HEAD_"
copy_config
mv "$new_gitdir/HEAD_" "$new_gitdir/HEAD"
fi
return 0
fi
if test -n "$update_head"
then
resolve_orig_gitdir
# Meh, ignore staging
echo "Updating head"
cp "$orig_gitdir/HEAD" "$new_gitdir/HEAD"
return 0
fi
# See if it's a workdir, resolve orig_workdir to that working directory
if test -h "$orig_gitdir/refs"
then
echo "This is a workdir."
old_workdir="$orig_workdir"
orig_workdir=$(git-new-workdir --show-orig "$orig_workdir") || die "\tCould not resolve original directory"
echo "\tResolving to original workdir: $orig_workdir"
get_orig_gitdir
fi
if test $# -lt 2 || test $# -gt 3
then
usage
fi
new_workdir=$2
branch=$3
# don't recreate a workdir over an existing repository
orig_workdir_abs="$(cd $orig_workdir && pwd)"
death_hint=""
if test "$new_workdir" != "${new_workdir%/}"
then
# Trailing slash, try to add
basedir="$new_workdir"
new_workdir="$new_workdir$(basename $orig_workdir_abs)"
test -e "$basedir" || die "Intermediate directory '$basedir' does not exist, cannot create '$new_workdir'. (The trailing slash means that the basename of orig workdir will be appended)".
else
death_hint=" (did you forget the trailing '/' ?)"
fi
test -e "$new_workdir" && die "New workdir '$new_workdir' already exists$death_hint"
get_new_gitdir
# don't link to a configured bare repository
isbare=$(git --git-dir="$orig_gitdir" config --bool --get core.bare)
if test ztrue = z$isbare -a -z "$bare"
then
die "\"$orig_gitdir\" has core.bare set to true," \
" remove from \"$orig_gitdir/config\" to use $0"
fi
echo "[ Old -> New ]\n\t$orig_workdir\n\t$new_workdir"
# create the gitdir
mkdir -p "$new_gitdir" || die "unable to create \"$new_gitdir\"!"
# create the links to the original repo. explicitly exclude index, HEAD and
# logs/HEAD from the list since they are purely related to the current working
# directory, and should not be shared.
for x in refs logs/refs objects info hooks packed-refs remotes rr-cache svn
do
case $x in
*/*)
mkdir -p "$(dirname "$new_gitdir/$x")"
;;
esac
ln -s "$orig_gitdir/$x" "$new_gitdir/$x"
done
# Add in quick file that points to original work dir
echo "$orig_workdir_abs" > "$new_gitdir/orig_workdir"
copy_config
x=modules
orig_modules="$orig_gitdir/$x"
new_modules="$new_gitdir/$x"
is_supermodule=
# Still checkout submodules if bare? Yes, that way we can see the log
if test -d "$orig_modules" -a -z "$ignore_submodules"
then
is_supermodule=1
# TODO Allow for directory structure... Checking if a module is
echo "\t[ Note ] Applying $bin to .git/modules since it's a supermodule"
modulate()
{
orig_path=$1
new_path=$2
modules=$(dir $orig_path)
for module in $modules
do
orig_module=$orig_path/$module
new_module=$new_path/$module
# If it's not a git module itself, then it might be a directory containing them. GO MONKEY GO!
if git_dir_check_hack $orig_module
then
# Teh recursion
$bin_path --bare $recurse_flags $orig_module $new_module
else
# Other recursion
echo "[ Submodule \"$module\" ]"
( modulate $orig_module $new_module )
fi
# See if it's a git module
done
}
modulate $orig_modules $new_modules
fi
# copy the HEAD from the original repository as a default branch
if test -z "$link_head"
then
cp "$orig_gitdir/HEAD" $new_gitdir/HEAD
else
# Link it if so desired
echo "WARNING: This does not seem to work." >&2
ln "$orig_gitdir/HEAD" $new_gitdir/HEAD
fi
if test -z "$bare" -a -z "$no_checkout"
then
# now setup the workdir
cd "$new_workdir"
# checkout the branch (either the same as HEAD from the original repository, or
# the one that was asked for)
git checkout -f $branch > /dev/null
# Update submodules - TODO Use `git sube` to allow --constrain option to be recursive ?
if test -n "$is_supermodule"
then
if test -n "$constrain"
then
modules=$(git config scm.focusGroup)
else
modules=
fi
git submodule update --init --recursive -- $modules
fi
fi