]>
Commit | Line | Data |
---|---|---|
8434c2f1 DB |
1 | /* |
2 | * Builtin "git clone" | |
3 | * | |
4 | * Copyright (c) 2007 Kristian Høgsberg <krh@redhat.com>, | |
5 | * 2008 Daniel Barkalow <barkalow@iabervon.org> | |
6 | * Based on git-commit.sh by Junio C Hamano and Linus Torvalds | |
7 | * | |
8 | * Clone a repository into a different directory that does not yet exist. | |
9 | */ | |
10 | ||
c2e86add | 11 | #include "builtin.h" |
697cc8ef | 12 | #include "lockfile.h" |
8434c2f1 DB |
13 | #include "parse-options.h" |
14 | #include "fetch-pack.h" | |
15 | #include "refs.h" | |
16 | #include "tree.h" | |
17 | #include "tree-walk.h" | |
18 | #include "unpack-trees.h" | |
19 | #include "transport.h" | |
20 | #include "strbuf.h" | |
21 | #include "dir.h" | |
4a16d072 | 22 | #include "sigchain.h" |
a9f2c136 | 23 | #include "branch.h" |
8ef51733 | 24 | #include "remote.h" |
dfa7a6c5 | 25 | #include "run-command.h" |
0433ad12 | 26 | #include "connected.h" |
8434c2f1 DB |
27 | |
28 | /* | |
29 | * Overall FIXMEs: | |
30 | * - respect DB_ENVIRONMENT for .git/objects. | |
31 | * | |
32 | * Implementation notes: | |
33 | * - dropping use-separate-remote and no-separate-remote compatibility | |
34 | * | |
35 | */ | |
36 | static const char * const builtin_clone_usage[] = { | |
32b77add | 37 | N_("git clone [options] [--] <repo> [<dir>]"), |
8434c2f1 DB |
38 | NULL |
39 | }; | |
40 | ||
3e6e0edd | 41 | static int option_no_checkout, option_bare, option_mirror, option_single_branch = -1; |
189260b1 | 42 | static int option_local = -1, option_no_hardlinks, option_shared, option_recursive; |
dbc92b07 | 43 | static char *option_template, *option_depth; |
8434c2f1 | 44 | static char *option_origin = NULL; |
7a4ee28f | 45 | static char *option_branch = NULL; |
b57fb80a | 46 | static const char *real_git_dir; |
8434c2f1 | 47 | static char *option_upload_pack = "git-upload-pack"; |
5bd631b3 | 48 | static int option_verbosity; |
01fdc21f | 49 | static int option_progress = -1; |
84054f79 | 50 | static struct string_list option_config; |
dbc92b07 JH |
51 | static struct string_list option_reference; |
52 | ||
53 | static int opt_parse_reference(const struct option *opt, const char *arg, int unset) | |
54 | { | |
55 | struct string_list *option_reference = opt->value; | |
56 | if (!arg) | |
57 | return -1; | |
58 | string_list_append(option_reference, arg); | |
59 | return 0; | |
60 | } | |
8434c2f1 DB |
61 | |
62 | static struct option builtin_clone_options[] = { | |
5bd631b3 | 63 | OPT__VERBOSITY(&option_verbosity), |
01fdc21f | 64 | OPT_BOOL(0, "progress", &option_progress, |
32b77add | 65 | N_("force progress reporting")), |
d5d09d47 SB |
66 | OPT_BOOL('n', "no-checkout", &option_no_checkout, |
67 | N_("don't create a checkout")), | |
4741edd5 SB |
68 | OPT_BOOL(0, "bare", &option_bare, N_("create a bare repository")), |
69 | OPT_HIDDEN_BOOL(0, "naked", &option_bare, | |
70 | N_("create a bare repository")), | |
d5d09d47 SB |
71 | OPT_BOOL(0, "mirror", &option_mirror, |
72 | N_("create a mirror repository (implies bare)")), | |
189260b1 | 73 | OPT_BOOL('l', "local", &option_local, |
32b77add | 74 | N_("to clone from a local repository")), |
d5d09d47 | 75 | OPT_BOOL(0, "no-hardlinks", &option_no_hardlinks, |
32b77add | 76 | N_("don't use local hardlinks, always copy")), |
d5d09d47 | 77 | OPT_BOOL('s', "shared", &option_shared, |
32b77add | 78 | N_("setup as shared repository")), |
d5d09d47 | 79 | OPT_BOOL(0, "recursive", &option_recursive, |
32b77add | 80 | N_("initialize submodules in the clone")), |
d5d09d47 | 81 | OPT_BOOL(0, "recurse-submodules", &option_recursive, |
32b77add NTND |
82 | N_("initialize submodules in the clone")), |
83 | OPT_STRING(0, "template", &option_template, N_("template-directory"), | |
84 | N_("directory from which templates will be used")), | |
85 | OPT_CALLBACK(0 , "reference", &option_reference, N_("repo"), | |
86 | N_("reference repository"), &opt_parse_reference), | |
87 | OPT_STRING('o', "origin", &option_origin, N_("name"), | |
88 | N_("use <name> instead of 'origin' to track upstream")), | |
89 | OPT_STRING('b', "branch", &option_branch, N_("branch"), | |
90 | N_("checkout <branch> instead of the remote's HEAD")), | |
91 | OPT_STRING('u', "upload-pack", &option_upload_pack, N_("path"), | |
92 | N_("path to git-upload-pack on the remote")), | |
93 | OPT_STRING(0, "depth", &option_depth, N_("depth"), | |
94 | N_("create a shallow clone of that depth")), | |
3e6e0edd | 95 | OPT_BOOL(0, "single-branch", &option_single_branch, |
32b77add NTND |
96 | N_("clone only one branch, HEAD or --branch")), |
97 | OPT_STRING(0, "separate-git-dir", &real_git_dir, N_("gitdir"), | |
98 | N_("separate git dir from working tree")), | |
99 | OPT_STRING_LIST('c', "config", &option_config, N_("key=value"), | |
100 | N_("set config inside the new repository")), | |
8434c2f1 DB |
101 | OPT_END() |
102 | }; | |
103 | ||
e7fed18a JH |
104 | static const char *argv_submodule[] = { |
105 | "submodule", "update", "--init", "--recursive", NULL | |
106 | }; | |
107 | ||
8434c2f1 DB |
108 | static char *get_repo_path(const char *repo, int *is_bundle) |
109 | { | |
b3256eb8 | 110 | static char *suffix[] = { "/.git", "", ".git/.git", ".git" }; |
8434c2f1 DB |
111 | static char *bundle_suffix[] = { ".bundle", "" }; |
112 | struct stat st; | |
113 | int i; | |
114 | ||
115 | for (i = 0; i < ARRAY_SIZE(suffix); i++) { | |
116 | const char *path; | |
117 | path = mkpath("%s%s", repo, suffix[i]); | |
9b0ebc72 NTND |
118 | if (stat(path, &st)) |
119 | continue; | |
b3256eb8 | 120 | if (S_ISDIR(st.st_mode) && is_git_directory(path)) { |
8434c2f1 | 121 | *is_bundle = 0; |
e2a57aac | 122 | return xstrdup(absolute_path(path)); |
9b0ebc72 NTND |
123 | } else if (S_ISREG(st.st_mode) && st.st_size > 8) { |
124 | /* Is it a "gitfile"? */ | |
125 | char signature[8]; | |
126 | int len, fd = open(path, O_RDONLY); | |
127 | if (fd < 0) | |
128 | continue; | |
129 | len = read_in_full(fd, signature, 8); | |
130 | close(fd); | |
131 | if (len != 8 || strncmp(signature, "gitdir: ", 8)) | |
132 | continue; | |
133 | path = read_gitfile(path); | |
134 | if (path) { | |
135 | *is_bundle = 0; | |
136 | return xstrdup(absolute_path(path)); | |
137 | } | |
8434c2f1 DB |
138 | } |
139 | } | |
140 | ||
141 | for (i = 0; i < ARRAY_SIZE(bundle_suffix); i++) { | |
142 | const char *path; | |
143 | path = mkpath("%s%s", repo, bundle_suffix[i]); | |
144 | if (!stat(path, &st) && S_ISREG(st.st_mode)) { | |
145 | *is_bundle = 1; | |
e2a57aac | 146 | return xstrdup(absolute_path(path)); |
8434c2f1 DB |
147 | } |
148 | } | |
149 | ||
150 | return NULL; | |
151 | } | |
152 | ||
6612f877 | 153 | static char *guess_dir_name(const char *repo, int is_bundle, int is_bare) |
8434c2f1 | 154 | { |
b8c5db35 | 155 | const char *end = repo + strlen(repo), *start; |
8a94bc7b | 156 | char *dir; |
b8c5db35 JS |
157 | |
158 | /* | |
8a94bc7b | 159 | * Strip trailing spaces, slashes and /.git |
b8c5db35 | 160 | */ |
8a94bc7b | 161 | while (repo < end && (is_dir_sep(end[-1]) || isspace(end[-1]))) |
b8c5db35 JS |
162 | end--; |
163 | if (end - repo > 5 && is_dir_sep(end[-5]) && | |
164 | !strncmp(end - 4, ".git", 4)) { | |
165 | end -= 5; | |
166 | while (repo < end && is_dir_sep(end[-1])) | |
167 | end--; | |
168 | } | |
169 | ||
170 | /* | |
171 | * Find last component, but be prepared that repo could have | |
172 | * the form "remote.example.com:foo.git", i.e. no slash | |
173 | * in the directory part. | |
174 | */ | |
175 | start = end; | |
176 | while (repo < start && !is_dir_sep(start[-1]) && start[-1] != ':') | |
177 | start--; | |
178 | ||
179 | /* | |
180 | * Strip .{bundle,git}. | |
181 | */ | |
182 | if (is_bundle) { | |
183 | if (end - start > 7 && !strncmp(end - 7, ".bundle", 7)) | |
184 | end -= 7; | |
185 | } else { | |
186 | if (end - start > 4 && !strncmp(end - 4, ".git", 4)) | |
187 | end -= 4; | |
8434c2f1 DB |
188 | } |
189 | ||
6612f877 | 190 | if (is_bare) { |
32716a2c MV |
191 | struct strbuf result = STRBUF_INIT; |
192 | strbuf_addf(&result, "%.*s.git", (int)(end - start), start); | |
2af202be | 193 | dir = strbuf_detach(&result, NULL); |
8a94bc7b AR |
194 | } else |
195 | dir = xstrndup(start, end - start); | |
196 | /* | |
197 | * Replace sequences of 'control' characters and whitespace | |
198 | * with one ascii space, remove leading and trailing spaces. | |
199 | */ | |
200 | if (*dir) { | |
201 | char *out = dir; | |
202 | int prev_space = 1 /* strip leading whitespace */; | |
203 | for (end = dir; *end; ++end) { | |
204 | char ch = *end; | |
205 | if ((unsigned char)ch < '\x20') | |
206 | ch = '\x20'; | |
207 | if (isspace(ch)) { | |
208 | if (prev_space) | |
209 | continue; | |
210 | prev_space = 1; | |
211 | } else | |
212 | prev_space = 0; | |
213 | *out++ = ch; | |
214 | } | |
215 | *out = '\0'; | |
216 | if (out > dir && prev_space) | |
217 | out[-1] = '\0'; | |
6612f877 | 218 | } |
8a94bc7b | 219 | return dir; |
8434c2f1 DB |
220 | } |
221 | ||
44a68fd5 CB |
222 | static void strip_trailing_slashes(char *dir) |
223 | { | |
224 | char *end = dir + strlen(dir); | |
225 | ||
226 | while (dir < end - 1 && is_dir_sep(end[-1])) | |
227 | end--; | |
228 | *end = '\0'; | |
229 | } | |
230 | ||
dbc92b07 | 231 | static int add_one_reference(struct string_list_item *item, void *cb_data) |
8434c2f1 | 232 | { |
e6baf4a1 | 233 | char *ref_git; |
b552b56d | 234 | const char *repo; |
e6baf4a1 | 235 | struct strbuf alternate = STRBUF_INIT; |
8434c2f1 | 236 | |
b552b56d | 237 | /* Beware: read_gitfile(), real_path() and mkpath() return static buffer */ |
e6baf4a1 | 238 | ref_git = xstrdup(real_path(item->string)); |
b552b56d AS |
239 | |
240 | repo = read_gitfile(ref_git); | |
241 | if (!repo) | |
242 | repo = read_gitfile(mkpath("%s/.git", ref_git)); | |
243 | if (repo) { | |
244 | free(ref_git); | |
245 | ref_git = xstrdup(repo); | |
246 | } | |
247 | ||
248 | if (!repo && is_directory(mkpath("%s/.git/objects", ref_git))) { | |
4e2d094d | 249 | char *ref_git_git = mkpathdup("%s/.git", ref_git); |
e6baf4a1 JH |
250 | free(ref_git); |
251 | ref_git = ref_git_git; | |
252 | } else if (!is_directory(mkpath("%s/objects", ref_git))) | |
0658569e | 253 | die(_("reference repository '%s' is not a local repository."), |
dbc92b07 | 254 | item->string); |
8434c2f1 | 255 | |
606e435a NTND |
256 | if (!access(mkpath("%s/shallow", ref_git), F_OK)) |
257 | die(_("reference repository '%s' is shallow"), item->string); | |
258 | ||
259 | if (!access(mkpath("%s/info/grafts", ref_git), F_OK)) | |
260 | die(_("reference repository '%s' is grafted"), item->string); | |
261 | ||
e6baf4a1 JH |
262 | strbuf_addf(&alternate, "%s/objects", ref_git); |
263 | add_to_alternates_file(alternate.buf); | |
264 | strbuf_release(&alternate); | |
e6baf4a1 | 265 | free(ref_git); |
dbc92b07 JH |
266 | return 0; |
267 | } | |
8434c2f1 | 268 | |
dbc92b07 JH |
269 | static void setup_reference(void) |
270 | { | |
271 | for_each_string_list(&option_reference, add_one_reference, NULL); | |
8434c2f1 DB |
272 | } |
273 | ||
e6baf4a1 JH |
274 | static void copy_alternates(struct strbuf *src, struct strbuf *dst, |
275 | const char *src_repo) | |
276 | { | |
277 | /* | |
278 | * Read from the source objects/info/alternates file | |
279 | * and copy the entries to corresponding file in the | |
280 | * destination repository with add_to_alternates_file(). | |
281 | * Both src and dst have "$path/objects/info/alternates". | |
282 | * | |
283 | * Instead of copying bit-for-bit from the original, | |
284 | * we need to append to existing one so that the already | |
285 | * created entry via "clone -s" is not lost, and also | |
286 | * to turn entries with paths relative to the original | |
287 | * absolute, so that they can be used in the new repository. | |
288 | */ | |
289 | FILE *in = fopen(src->buf, "r"); | |
290 | struct strbuf line = STRBUF_INIT; | |
291 | ||
292 | while (strbuf_getline(&line, in, '\n') != EOF) { | |
293 | char *abs_path, abs_buf[PATH_MAX]; | |
294 | if (!line.len || line.buf[0] == '#') | |
295 | continue; | |
296 | if (is_absolute_path(line.buf)) { | |
297 | add_to_alternates_file(line.buf); | |
298 | continue; | |
299 | } | |
300 | abs_path = mkpath("%s/objects/%s", src_repo, line.buf); | |
301 | normalize_path_copy(abs_buf, abs_path); | |
302 | add_to_alternates_file(abs_buf); | |
303 | } | |
304 | strbuf_release(&line); | |
305 | fclose(in); | |
306 | } | |
307 | ||
308 | static void copy_or_link_directory(struct strbuf *src, struct strbuf *dest, | |
309 | const char *src_repo, int src_baselen) | |
8434c2f1 DB |
310 | { |
311 | struct dirent *de; | |
312 | struct stat buf; | |
313 | int src_len, dest_len; | |
314 | DIR *dir; | |
315 | ||
b9e125e0 | 316 | dir = opendir(src->buf); |
8434c2f1 | 317 | if (!dir) |
e84d7b74 | 318 | die_errno(_("failed to open '%s'"), src->buf); |
8434c2f1 | 319 | |
b9e125e0 | 320 | if (mkdir(dest->buf, 0777)) { |
8434c2f1 | 321 | if (errno != EEXIST) |
e84d7b74 | 322 | die_errno(_("failed to create directory '%s'"), dest->buf); |
b9e125e0 | 323 | else if (stat(dest->buf, &buf)) |
e84d7b74 | 324 | die_errno(_("failed to stat '%s'"), dest->buf); |
8434c2f1 | 325 | else if (!S_ISDIR(buf.st_mode)) |
e84d7b74 | 326 | die(_("%s exists and is not a directory"), dest->buf); |
8434c2f1 DB |
327 | } |
328 | ||
b9e125e0 MV |
329 | strbuf_addch(src, '/'); |
330 | src_len = src->len; | |
331 | strbuf_addch(dest, '/'); | |
332 | dest_len = dest->len; | |
8434c2f1 DB |
333 | |
334 | while ((de = readdir(dir)) != NULL) { | |
b9e125e0 MV |
335 | strbuf_setlen(src, src_len); |
336 | strbuf_addstr(src, de->d_name); | |
337 | strbuf_setlen(dest, dest_len); | |
338 | strbuf_addstr(dest, de->d_name); | |
339 | if (stat(src->buf, &buf)) { | |
e84d7b74 | 340 | warning (_("failed to stat %s\n"), src->buf); |
8434c2f1 DB |
341 | continue; |
342 | } | |
343 | if (S_ISDIR(buf.st_mode)) { | |
344 | if (de->d_name[0] != '.') | |
e6baf4a1 JH |
345 | copy_or_link_directory(src, dest, |
346 | src_repo, src_baselen); | |
347 | continue; | |
348 | } | |
349 | ||
350 | /* Files that cannot be copied bit-for-bit... */ | |
351 | if (!strcmp(src->buf + src_baselen, "/info/alternates")) { | |
352 | copy_alternates(src, dest, src_repo); | |
8434c2f1 DB |
353 | continue; |
354 | } | |
355 | ||
b9e125e0 | 356 | if (unlink(dest->buf) && errno != ENOENT) |
e84d7b74 | 357 | die_errno(_("failed to unlink '%s'"), dest->buf); |
fdabc242 | 358 | if (!option_no_hardlinks) { |
b9e125e0 | 359 | if (!link(src->buf, dest->buf)) |
fdabc242 | 360 | continue; |
189260b1 | 361 | if (option_local > 0) |
e84d7b74 | 362 | die_errno(_("failed to create link '%s'"), dest->buf); |
fdabc242 | 363 | option_no_hardlinks = 1; |
8434c2f1 | 364 | } |
f7835a25 | 365 | if (copy_file_with_time(dest->buf, src->buf, 0666)) |
e84d7b74 | 366 | die_errno(_("failed to copy file to '%s'"), dest->buf); |
8434c2f1 | 367 | } |
689ef4d4 | 368 | closedir(dir); |
8434c2f1 DB |
369 | } |
370 | ||
6f48d39f | 371 | static void clone_local(const char *src_repo, const char *dest_repo) |
8434c2f1 | 372 | { |
e6baf4a1 JH |
373 | if (option_shared) { |
374 | struct strbuf alt = STRBUF_INIT; | |
375 | strbuf_addf(&alt, "%s/objects", src_repo); | |
376 | add_to_alternates_file(alt.buf); | |
377 | strbuf_release(&alt); | |
378 | } else { | |
379 | struct strbuf src = STRBUF_INIT; | |
380 | struct strbuf dest = STRBUF_INIT; | |
b9e125e0 MV |
381 | strbuf_addf(&src, "%s/objects", src_repo); |
382 | strbuf_addf(&dest, "%s/objects", dest_repo); | |
e6baf4a1 | 383 | copy_or_link_directory(&src, &dest, src_repo, src.len); |
b9e125e0 MV |
384 | strbuf_release(&src); |
385 | strbuf_release(&dest); | |
8434c2f1 DB |
386 | } |
387 | ||
28ba96ab | 388 | if (0 <= option_verbosity) |
68b939b2 | 389 | fprintf(stderr, _("done.\n")); |
8434c2f1 DB |
390 | } |
391 | ||
392 | static const char *junk_work_tree; | |
393 | static const char *junk_git_dir; | |
85064630 | 394 | static enum { |
d3b34622 JK |
395 | JUNK_LEAVE_NONE, |
396 | JUNK_LEAVE_REPO, | |
397 | JUNK_LEAVE_ALL | |
398 | } junk_mode = JUNK_LEAVE_NONE; | |
399 | ||
400 | static const char junk_leave_repo_msg[] = | |
401 | N_("Clone succeeded, but checkout failed.\n" | |
402 | "You can inspect what was checked out with 'git status'\n" | |
403 | "and retry the checkout with 'git checkout -f HEAD'\n"); | |
8434c2f1 DB |
404 | |
405 | static void remove_junk(void) | |
406 | { | |
f285a2d7 | 407 | struct strbuf sb = STRBUF_INIT; |
d3b34622 JK |
408 | |
409 | switch (junk_mode) { | |
410 | case JUNK_LEAVE_REPO: | |
411 | warning("%s", _(junk_leave_repo_msg)); | |
412 | /* fall-through */ | |
413 | case JUNK_LEAVE_ALL: | |
414 | return; | |
415 | default: | |
416 | /* proceed to removal */ | |
417 | break; | |
418 | } | |
419 | ||
8434c2f1 DB |
420 | if (junk_git_dir) { |
421 | strbuf_addstr(&sb, junk_git_dir); | |
422 | remove_dir_recursively(&sb, 0); | |
423 | strbuf_reset(&sb); | |
424 | } | |
425 | if (junk_work_tree) { | |
426 | strbuf_addstr(&sb, junk_work_tree); | |
427 | remove_dir_recursively(&sb, 0); | |
428 | strbuf_reset(&sb); | |
429 | } | |
430 | } | |
431 | ||
432 | static void remove_junk_on_signal(int signo) | |
433 | { | |
434 | remove_junk(); | |
4a16d072 | 435 | sigchain_pop(signo); |
8434c2f1 DB |
436 | raise(signo); |
437 | } | |
438 | ||
9e585046 NTND |
439 | static struct ref *find_remote_branch(const struct ref *refs, const char *branch) |
440 | { | |
441 | struct ref *ref; | |
442 | struct strbuf head = STRBUF_INIT; | |
443 | strbuf_addstr(&head, "refs/heads/"); | |
444 | strbuf_addstr(&head, branch); | |
445 | ref = find_ref_by_name(refs, head.buf); | |
446 | strbuf_release(&head); | |
5a7d5b68 NTND |
447 | |
448 | if (ref) | |
449 | return ref; | |
450 | ||
451 | strbuf_addstr(&head, "refs/tags/"); | |
452 | strbuf_addstr(&head, branch); | |
453 | ref = find_ref_by_name(refs, head.buf); | |
454 | strbuf_release(&head); | |
455 | ||
9e585046 NTND |
456 | return ref; |
457 | } | |
458 | ||
5bdc32d3 NP |
459 | static struct ref *wanted_peer_refs(const struct ref *refs, |
460 | struct refspec *refspec) | |
8434c2f1 | 461 | { |
c1921c18 JK |
462 | struct ref *head = copy_ref(find_ref_by_name(refs, "HEAD")); |
463 | struct ref *local_refs = head; | |
464 | struct ref **tail = head ? &head->next : &local_refs; | |
8434c2f1 | 465 | |
3e6e0edd NTND |
466 | if (option_single_branch) { |
467 | struct ref *remote_head = NULL; | |
468 | ||
469 | if (!option_branch) | |
470 | remote_head = guess_remote_head(head, refs, 0); | |
0ec4b165 NTND |
471 | else { |
472 | local_refs = NULL; | |
473 | tail = &local_refs; | |
474 | remote_head = copy_ref(find_remote_branch(refs, option_branch)); | |
475 | } | |
3e6e0edd NTND |
476 | |
477 | if (!remote_head && option_branch) | |
478 | warning(_("Could not find remote branch %s to clone."), | |
479 | option_branch); | |
5a7d5b68 | 480 | else { |
3e6e0edd | 481 | get_fetch_map(remote_head, refspec, &tail, 0); |
5a7d5b68 NTND |
482 | |
483 | /* if --branch=tag, pull the requested tag explicitly */ | |
484 | get_fetch_map(remote_head, tag_refspec, &tail, 0); | |
485 | } | |
3e6e0edd NTND |
486 | } else |
487 | get_fetch_map(refs, refspec, &tail, 0); | |
488 | ||
489 | if (!option_mirror && !option_single_branch) | |
468386a9 | 490 | get_fetch_map(refs, tag_refspec, &tail, 0); |
8434c2f1 | 491 | |
5bdc32d3 NP |
492 | return local_refs; |
493 | } | |
494 | ||
495 | static void write_remote_refs(const struct ref *local_refs) | |
496 | { | |
497 | const struct ref *r; | |
498 | ||
9f69d297 MH |
499 | lock_packed_refs(LOCK_DIE_ON_ERROR); |
500 | ||
c1921c18 JK |
501 | for (r = local_refs; r; r = r->next) { |
502 | if (!r->peer_ref) | |
503 | continue; | |
39ef7fae | 504 | add_packed_ref(r->peer_ref->name, r->old_sha1); |
c1921c18 | 505 | } |
3e8aded2 | 506 | |
9f69d297 MH |
507 | if (commit_packed_refs()) |
508 | die_errno("unable to overwrite old ref-pack file"); | |
8434c2f1 DB |
509 | } |
510 | ||
3e6e0edd NTND |
511 | static void write_followtags(const struct ref *refs, const char *msg) |
512 | { | |
513 | const struct ref *ref; | |
514 | for (ref = refs; ref; ref = ref->next) { | |
59556548 | 515 | if (!starts_with(ref->name, "refs/tags/")) |
3e6e0edd | 516 | continue; |
59556548 | 517 | if (ends_with(ref->name, "^{}")) |
3e6e0edd NTND |
518 | continue; |
519 | if (!has_sha1_file(ref->old_sha1)) | |
520 | continue; | |
521 | update_ref(msg, ref->name, ref->old_sha1, | |
f4124112 | 522 | NULL, 0, UPDATE_REFS_DIE_ON_ERR); |
3e6e0edd NTND |
523 | } |
524 | } | |
525 | ||
0433ad12 JK |
526 | static int iterate_ref_map(void *cb_data, unsigned char sha1[20]) |
527 | { | |
528 | struct ref **rm = cb_data; | |
529 | struct ref *ref = *rm; | |
530 | ||
531 | /* | |
532 | * Skip anything missing a peer_ref, which we are not | |
533 | * actually going to write a ref for. | |
534 | */ | |
535 | while (ref && !ref->peer_ref) | |
536 | ref = ref->next; | |
537 | /* Returning -1 notes "end of list" to the caller. */ | |
538 | if (!ref) | |
539 | return -1; | |
540 | ||
541 | hashcpy(sha1, ref->old_sha1); | |
542 | *rm = ref->next; | |
543 | return 0; | |
544 | } | |
545 | ||
960b7d1c NTND |
546 | static void update_remote_refs(const struct ref *refs, |
547 | const struct ref *mapped_refs, | |
548 | const struct ref *remote_head_points_at, | |
549 | const char *branch_top, | |
c6807a40 | 550 | const char *msg, |
45ed4afa | 551 | struct transport *transport, |
125a05fd | 552 | int check_connectivity) |
960b7d1c | 553 | { |
0433ad12 JK |
554 | const struct ref *rm = mapped_refs; |
555 | ||
125a05fd | 556 | if (check_connectivity) { |
2856cbf0 | 557 | if (transport->progress) |
68b939b2 | 558 | fprintf(stderr, _("Checking connectivity... ")); |
45ed4afa JH |
559 | if (check_everything_connected_with_transport(iterate_ref_map, |
560 | 0, &rm, transport)) | |
125a05fd | 561 | die(_("remote did not send all necessary objects")); |
2856cbf0 | 562 | if (transport->progress) |
f94a84c4 | 563 | fprintf(stderr, _("done.\n")); |
125a05fd | 564 | } |
0433ad12 | 565 | |
960b7d1c | 566 | if (refs) { |
960b7d1c NTND |
567 | write_remote_refs(mapped_refs); |
568 | if (option_single_branch) | |
569 | write_followtags(refs, msg); | |
570 | } | |
571 | ||
572 | if (remote_head_points_at && !option_bare) { | |
573 | struct strbuf head_ref = STRBUF_INIT; | |
574 | strbuf_addstr(&head_ref, branch_top); | |
575 | strbuf_addstr(&head_ref, "HEAD"); | |
576 | create_symref(head_ref.buf, | |
577 | remote_head_points_at->peer_ref->name, | |
578 | msg); | |
579 | } | |
580 | } | |
581 | ||
f034d354 NTND |
582 | static void update_head(const struct ref *our, const struct ref *remote, |
583 | const char *msg) | |
584 | { | |
cf4fff57 JK |
585 | const char *head; |
586 | if (our && skip_prefix(our->name, "refs/heads/", &head)) { | |
f034d354 NTND |
587 | /* Local default branch link */ |
588 | create_symref("HEAD", our->name, NULL); | |
589 | if (!option_bare) { | |
f4124112 MH |
590 | update_ref(msg, "HEAD", our->old_sha1, NULL, 0, |
591 | UPDATE_REFS_DIE_ON_ERR); | |
f034d354 NTND |
592 | install_branch_config(0, head, option_origin, our->name); |
593 | } | |
5a7d5b68 NTND |
594 | } else if (our) { |
595 | struct commit *c = lookup_commit_reference(our->old_sha1); | |
596 | /* --branch specifies a non-branch (i.e. tags), detach HEAD */ | |
597 | update_ref(msg, "HEAD", c->object.sha1, | |
f4124112 | 598 | NULL, REF_NODEREF, UPDATE_REFS_DIE_ON_ERR); |
f034d354 NTND |
599 | } else if (remote) { |
600 | /* | |
601 | * We know remote HEAD points to a non-branch, or | |
920b691f | 602 | * HEAD points to a branch but we don't know which one. |
f034d354 NTND |
603 | * Detach HEAD in all these cases. |
604 | */ | |
605 | update_ref(msg, "HEAD", remote->old_sha1, | |
f4124112 | 606 | NULL, REF_NODEREF, UPDATE_REFS_DIE_ON_ERR); |
f034d354 NTND |
607 | } |
608 | } | |
609 | ||
c39852c1 NTND |
610 | static int checkout(void) |
611 | { | |
612 | unsigned char sha1[20]; | |
613 | char *head; | |
614 | struct lock_file *lock_file; | |
615 | struct unpack_trees_options opts; | |
616 | struct tree *tree; | |
617 | struct tree_desc t; | |
03b86647 | 618 | int err = 0; |
c39852c1 NTND |
619 | |
620 | if (option_no_checkout) | |
621 | return 0; | |
622 | ||
7695d118 | 623 | head = resolve_refdup("HEAD", RESOLVE_REF_READING, sha1, NULL); |
c39852c1 NTND |
624 | if (!head) { |
625 | warning(_("remote HEAD refers to nonexistent ref, " | |
626 | "unable to checkout.\n")); | |
627 | return 0; | |
628 | } | |
2857093b NTND |
629 | if (!strcmp(head, "HEAD")) { |
630 | if (advice_detached_head) | |
631 | detach_advice(sha1_to_hex(sha1)); | |
632 | } else { | |
59556548 | 633 | if (!starts_with(head, "refs/heads/")) |
c39852c1 NTND |
634 | die(_("HEAD not found below refs/heads!")); |
635 | } | |
636 | free(head); | |
637 | ||
638 | /* We need to be in the new work tree for the checkout */ | |
639 | setup_work_tree(); | |
640 | ||
641 | lock_file = xcalloc(1, sizeof(struct lock_file)); | |
03b86647 | 642 | hold_locked_index(lock_file, 1); |
c39852c1 NTND |
643 | |
644 | memset(&opts, 0, sizeof opts); | |
645 | opts.update = 1; | |
646 | opts.merge = 1; | |
647 | opts.fn = oneway_merge; | |
8f63da13 | 648 | opts.verbose_update = (option_verbosity >= 0); |
c39852c1 NTND |
649 | opts.src_index = &the_index; |
650 | opts.dst_index = &the_index; | |
651 | ||
652 | tree = parse_tree_indirect(sha1); | |
653 | parse_tree(tree); | |
654 | init_tree_desc(&t, tree->buffer, tree->size); | |
0aac7bb2 JK |
655 | if (unpack_trees(1, &t, &opts) < 0) |
656 | die(_("unable to checkout working tree")); | |
c39852c1 | 657 | |
03b86647 | 658 | if (write_locked_index(&the_index, lock_file, COMMIT_LOCK)) |
c39852c1 NTND |
659 | die(_("unable to write new index file")); |
660 | ||
15048f8a BP |
661 | err |= run_hook_le(NULL, "post-checkout", sha1_to_hex(null_sha1), |
662 | sha1_to_hex(sha1), "1", NULL); | |
c39852c1 NTND |
663 | |
664 | if (!err && option_recursive) | |
665 | err = run_command_v_opt(argv_submodule, RUN_GIT_CMD); | |
666 | ||
667 | return err; | |
668 | } | |
669 | ||
84054f79 JK |
670 | static int write_one_config(const char *key, const char *value, void *data) |
671 | { | |
672 | return git_config_set_multivar(key, value ? value : "true", "^$", 0); | |
673 | } | |
674 | ||
675 | static void write_config(struct string_list *config) | |
676 | { | |
677 | int i; | |
678 | ||
679 | for (i = 0; i < config->nr; i++) { | |
680 | if (git_config_parse_parameter(config->items[i].string, | |
681 | write_one_config, NULL) < 0) | |
682 | die("unable to write parameters to config file"); | |
683 | } | |
684 | } | |
685 | ||
24d36f14 DA |
686 | static void write_refspec_config(const char *src_ref_prefix, |
687 | const struct ref *our_head_points_at, | |
688 | const struct ref *remote_head_points_at, | |
689 | struct strbuf *branch_top) | |
31b808a0 RT |
690 | { |
691 | struct strbuf key = STRBUF_INIT; | |
692 | struct strbuf value = STRBUF_INIT; | |
693 | ||
694 | if (option_mirror || !option_bare) { | |
695 | if (option_single_branch && !option_mirror) { | |
696 | if (option_branch) { | |
60a5f5fc | 697 | if (starts_with(our_head_points_at->name, "refs/tags/")) |
31b808a0 RT |
698 | strbuf_addf(&value, "+%s:%s", our_head_points_at->name, |
699 | our_head_points_at->name); | |
700 | else | |
701 | strbuf_addf(&value, "+%s:%s%s", our_head_points_at->name, | |
702 | branch_top->buf, option_branch); | |
703 | } else if (remote_head_points_at) { | |
cf4fff57 JK |
704 | const char *head = remote_head_points_at->name; |
705 | if (!skip_prefix(head, "refs/heads/", &head)) | |
706 | die("BUG: remote HEAD points at non-head?"); | |
707 | ||
31b808a0 | 708 | strbuf_addf(&value, "+%s:%s%s", remote_head_points_at->name, |
cf4fff57 | 709 | branch_top->buf, head); |
31b808a0 RT |
710 | } |
711 | /* | |
712 | * otherwise, the next "git fetch" will | |
713 | * simply fetch from HEAD without updating | |
d6ac1d21 | 714 | * any remote-tracking branch, which is what |
31b808a0 RT |
715 | * we want. |
716 | */ | |
717 | } else { | |
718 | strbuf_addf(&value, "+%s*:%s*", src_ref_prefix, branch_top->buf); | |
719 | } | |
720 | /* Configure the remote */ | |
721 | if (value.len) { | |
722 | strbuf_addf(&key, "remote.%s.fetch", option_origin); | |
723 | git_config_set_multivar(key.buf, value.buf, "^$", 0); | |
724 | strbuf_reset(&key); | |
725 | ||
726 | if (option_mirror) { | |
727 | strbuf_addf(&key, "remote.%s.mirror", option_origin); | |
728 | git_config_set(key.buf, "true"); | |
729 | strbuf_reset(&key); | |
730 | } | |
731 | } | |
732 | } | |
733 | ||
734 | strbuf_release(&key); | |
735 | strbuf_release(&value); | |
736 | } | |
737 | ||
8434c2f1 DB |
738 | int cmd_clone(int argc, const char **argv, const char *prefix) |
739 | { | |
24c61c44 | 740 | int is_bundle = 0, is_local; |
8434c2f1 DB |
741 | struct stat buf; |
742 | const char *repo_name, *repo, *work_tree, *git_dir; | |
743 | char *path, *dir; | |
55892d23 | 744 | int dest_exists; |
37148311 | 745 | const struct ref *refs, *remote_head; |
7a4ee28f JK |
746 | const struct ref *remote_head_points_at; |
747 | const struct ref *our_head_points_at; | |
37148311 | 748 | struct ref *mapped_refs; |
90498161 | 749 | const struct ref *ref; |
b5ff37ac MV |
750 | struct strbuf key = STRBUF_INIT, value = STRBUF_INIT; |
751 | struct strbuf branch_top = STRBUF_INIT, reflog_msg = STRBUF_INIT; | |
1db4a75c | 752 | struct transport *transport = NULL; |
9e585046 | 753 | const char *src_ref_prefix = "refs/heads/"; |
6f48d39f | 754 | struct remote *remote; |
90498161 | 755 | int err = 0, complete_refs_before_fetch = 1; |
8434c2f1 | 756 | |
689f0396 DB |
757 | struct refspec *refspec; |
758 | const char *fetch_pattern; | |
8434c2f1 | 759 | |
bbc30f99 | 760 | packet_trace_identity("clone"); |
37782920 | 761 | argc = parse_options(argc, argv, prefix, builtin_clone_options, |
8434c2f1 DB |
762 | builtin_clone_usage, 0); |
763 | ||
d52dc4b1 | 764 | if (argc > 2) |
e84d7b74 | 765 | usage_msg_opt(_("Too many arguments."), |
d52dc4b1 JN |
766 | builtin_clone_usage, builtin_clone_options); |
767 | ||
8434c2f1 | 768 | if (argc == 0) |
e84d7b74 | 769 | usage_msg_opt(_("You must specify a repository to clone."), |
d52dc4b1 | 770 | builtin_clone_usage, builtin_clone_options); |
8434c2f1 | 771 | |
3e6e0edd NTND |
772 | if (option_single_branch == -1) |
773 | option_single_branch = option_depth ? 1 : 0; | |
774 | ||
bc699afc JS |
775 | if (option_mirror) |
776 | option_bare = 1; | |
777 | ||
8434c2f1 DB |
778 | if (option_bare) { |
779 | if (option_origin) | |
e84d7b74 | 780 | die(_("--bare and --origin %s options are incompatible."), |
8434c2f1 | 781 | option_origin); |
95b63f1e NTND |
782 | if (real_git_dir) |
783 | die(_("--bare and --separate-git-dir are incompatible.")); | |
8434c2f1 | 784 | option_no_checkout = 1; |
8434c2f1 DB |
785 | } |
786 | ||
787 | if (!option_origin) | |
788 | option_origin = "origin"; | |
789 | ||
790 | repo_name = argv[0]; | |
791 | ||
792 | path = get_repo_path(repo_name, &is_bundle); | |
793 | if (path) | |
e2a57aac | 794 | repo = xstrdup(absolute_path(repo_name)); |
8434c2f1 | 795 | else if (!strchr(repo_name, ':')) |
d3e1ddfd | 796 | die(_("repository '%s' does not exist"), repo_name); |
8434c2f1 DB |
797 | else |
798 | repo = repo_name; | |
799 | ||
5594bcad NTND |
800 | /* no need to be strict, transport_set_option() will validate it again */ |
801 | if (option_depth && atoi(option_depth) < 1) | |
802 | die(_("depth %s is not a positive number"), option_depth); | |
803 | ||
8434c2f1 DB |
804 | if (argc == 2) |
805 | dir = xstrdup(argv[1]); | |
806 | else | |
6612f877 | 807 | dir = guess_dir_name(repo_name, is_bundle, option_bare); |
44a68fd5 | 808 | strip_trailing_slashes(dir); |
8434c2f1 | 809 | |
55892d23 AP |
810 | dest_exists = !stat(dir, &buf); |
811 | if (dest_exists && !is_empty_dir(dir)) | |
e84d7b74 ÆAB |
812 | die(_("destination path '%s' already exists and is not " |
813 | "an empty directory."), dir); | |
8434c2f1 | 814 | |
8434c2f1 DB |
815 | strbuf_addf(&reflog_msg, "clone: from %s", repo); |
816 | ||
817 | if (option_bare) | |
818 | work_tree = NULL; | |
819 | else { | |
820 | work_tree = getenv("GIT_WORK_TREE"); | |
821 | if (work_tree && !stat(work_tree, &buf)) | |
e84d7b74 | 822 | die(_("working tree '%s' already exists."), work_tree); |
8434c2f1 DB |
823 | } |
824 | ||
825 | if (option_bare || work_tree) | |
826 | git_dir = xstrdup(dir); | |
827 | else { | |
828 | work_tree = dir; | |
4e2d094d | 829 | git_dir = mkpathdup("%s/.git", dir); |
8434c2f1 DB |
830 | } |
831 | ||
832 | if (!option_bare) { | |
833 | junk_work_tree = work_tree; | |
8e21d63b | 834 | if (safe_create_leading_directories_const(work_tree) < 0) |
e84d7b74 | 835 | die_errno(_("could not create leading directories of '%s'"), |
d824cbba | 836 | work_tree); |
45d4fdc2 | 837 | if (!dest_exists && mkdir(work_tree, 0777)) |
e84d7b74 | 838 | die_errno(_("could not create work tree dir '%s'."), |
d824cbba | 839 | work_tree); |
8434c2f1 DB |
840 | set_git_work_tree(work_tree); |
841 | } | |
842 | junk_git_dir = git_dir; | |
843 | atexit(remove_junk); | |
57b235a4 | 844 | sigchain_push_common(remove_junk_on_signal); |
8434c2f1 | 845 | |
8e21d63b | 846 | if (safe_create_leading_directories_const(git_dir) < 0) |
e84d7b74 | 847 | die(_("could not create leading directories of '%s'"), git_dir); |
b57fb80a NTND |
848 | |
849 | set_git_dir_init(git_dir, real_git_dir, 0); | |
9be1980b | 850 | if (real_git_dir) { |
b57fb80a | 851 | git_dir = real_git_dir; |
9be1980b JL |
852 | junk_git_dir = real_git_dir; |
853 | } | |
8434c2f1 | 854 | |
3781fcce ÆAB |
855 | if (0 <= option_verbosity) { |
856 | if (option_bare) | |
68b939b2 | 857 | fprintf(stderr, _("Cloning into bare repository '%s'...\n"), dir); |
3781fcce | 858 | else |
68b939b2 | 859 | fprintf(stderr, _("Cloning into '%s'...\n"), dir); |
3781fcce | 860 | } |
28ba96ab | 861 | init_db(option_template, INIT_DB_QUIET); |
84054f79 | 862 | write_config(&option_config); |
8434c2f1 | 863 | |
9bd81e42 | 864 | git_config(git_default_config, NULL); |
8434c2f1 DB |
865 | |
866 | if (option_bare) { | |
bc699afc JS |
867 | if (option_mirror) |
868 | src_ref_prefix = "refs/"; | |
b5ff37ac | 869 | strbuf_addstr(&branch_top, src_ref_prefix); |
8434c2f1 DB |
870 | |
871 | git_config_set("core.bare", "true"); | |
872 | } else { | |
b5ff37ac | 873 | strbuf_addf(&branch_top, "refs/remotes/%s/", option_origin); |
bc699afc | 874 | } |
8434c2f1 | 875 | |
689f0396 | 876 | strbuf_addf(&value, "+%s*:%s*", src_ref_prefix, branch_top.buf); |
df61c889 SR |
877 | strbuf_addf(&key, "remote.%s.url", option_origin); |
878 | git_config_set(key.buf, repo); | |
879 | strbuf_reset(&key); | |
880 | ||
dbc92b07 JH |
881 | if (option_reference.nr) |
882 | setup_reference(); | |
766ac6a6 | 883 | |
689f0396 DB |
884 | fetch_pattern = value.buf; |
885 | refspec = parse_fetch_refspec(1, &fetch_pattern); | |
886 | ||
887 | strbuf_reset(&value); | |
8434c2f1 | 888 | |
6f48d39f NTND |
889 | remote = remote_get(option_origin); |
890 | transport = transport_get(remote, remote->url[0]); | |
f38aa83f MB |
891 | path = get_repo_path(remote->url[0], &is_bundle); |
892 | is_local = option_local != 0 && path && !is_bundle; | |
893 | if (is_local) { | |
894 | if (option_depth) | |
895 | warning(_("--depth is ignored in local clones; use file:// instead.")); | |
896 | if (!access(mkpath("%s/shallow", path), F_OK)) { | |
897 | if (option_local > 0) | |
898 | warning(_("source repository is shallow, ignoring --local")); | |
899 | is_local = 0; | |
900 | } | |
901 | } | |
902 | if (option_local > 0 && !is_local) | |
903 | warning(_("--local is ignored")); | |
beea4152 | 904 | transport->cloning = 1; |
8434c2f1 | 905 | |
643f918d JK |
906 | if (!transport->get_refs_list || (!is_local && !transport->fetch)) |
907 | die(_("Don't know how to clone %s"), transport->url); | |
37b78c25 | 908 | |
643f918d | 909 | transport_set_option(transport, TRANS_OPT_KEEP, "yes"); |
8434c2f1 | 910 | |
643f918d JK |
911 | if (option_depth) |
912 | transport_set_option(transport, TRANS_OPT_DEPTH, | |
913 | option_depth); | |
914 | if (option_single_branch) | |
915 | transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1"); | |
8434c2f1 | 916 | |
643f918d | 917 | transport_set_verbosity(transport, option_verbosity, option_progress); |
8434c2f1 | 918 | |
643f918d JK |
919 | if (option_upload_pack) |
920 | transport_set_option(transport, TRANS_OPT_UPLOADPACK, | |
921 | option_upload_pack); | |
c6807a40 | 922 | |
643f918d JK |
923 | if (transport->smart_options && !option_depth) |
924 | transport->smart_options->check_self_contained_and_connected = 1; | |
8434c2f1 | 925 | |
6f48d39f | 926 | refs = transport_get_remote_refs(transport); |
8434c2f1 | 927 | |
5b05795c MH |
928 | if (refs) { |
929 | mapped_refs = wanted_peer_refs(refs, refspec); | |
930 | /* | |
931 | * transport_get_remote_refs() may return refs with null sha-1 | |
932 | * in mapped_refs (see struct transport->get_refs_list | |
933 | * comment). In that case we need fetch it early because | |
934 | * remote_head code below relies on it. | |
935 | * | |
936 | * for normal clones, transport_get_remote_refs() should | |
937 | * return reliable ref set, we can delay cloning until after | |
938 | * remote HEAD check. | |
939 | */ | |
940 | for (ref = refs; ref; ref = ref->next) | |
941 | if (is_null_sha1(ref->old_sha1)) { | |
942 | complete_refs_before_fetch = 0; | |
943 | break; | |
944 | } | |
90498161 | 945 | |
5b05795c MH |
946 | if (!is_local && !complete_refs_before_fetch) |
947 | transport_fetch_refs(transport, mapped_refs); | |
8434c2f1 | 948 | |
6cb4e6cc | 949 | remote_head = find_ref_by_name(refs, "HEAD"); |
7a4ee28f JK |
950 | remote_head_points_at = |
951 | guess_remote_head(remote_head, mapped_refs, 0); | |
952 | ||
953 | if (option_branch) { | |
7a4ee28f | 954 | our_head_points_at = |
9e585046 | 955 | find_remote_branch(mapped_refs, option_branch); |
7a4ee28f | 956 | |
920b691f NTND |
957 | if (!our_head_points_at) |
958 | die(_("Remote branch %s not found in upstream %s"), | |
959 | option_branch, option_origin); | |
7a4ee28f JK |
960 | } |
961 | else | |
962 | our_head_points_at = remote_head_points_at; | |
86ac7518 SR |
963 | } |
964 | else { | |
a3552aba RT |
965 | if (option_branch) |
966 | die(_("Remote branch %s not found in upstream %s"), | |
967 | option_branch, option_origin); | |
968 | ||
e84d7b74 | 969 | warning(_("You appear to have cloned an empty repository.")); |
5b05795c | 970 | mapped_refs = NULL; |
7a4ee28f JK |
971 | our_head_points_at = NULL; |
972 | remote_head_points_at = NULL; | |
86ac7518 SR |
973 | remote_head = NULL; |
974 | option_no_checkout = 1; | |
5cd12b85 | 975 | if (!option_bare) |
a9f2c136 | 976 | install_branch_config(0, "master", option_origin, |
5cd12b85 | 977 | "refs/heads/master"); |
86ac7518 | 978 | } |
8434c2f1 | 979 | |
31b808a0 RT |
980 | write_refspec_config(src_ref_prefix, our_head_points_at, |
981 | remote_head_points_at, &branch_top); | |
982 | ||
6f48d39f NTND |
983 | if (is_local) |
984 | clone_local(path, git_dir); | |
90498161 | 985 | else if (refs && complete_refs_before_fetch) |
6f48d39f | 986 | transport_fetch_refs(transport, mapped_refs); |
8434c2f1 | 987 | |
960b7d1c | 988 | update_remote_refs(refs, mapped_refs, remote_head_points_at, |
45ed4afa | 989 | branch_top.buf, reflog_msg.buf, transport, !is_local); |
8434c2f1 | 990 | |
f034d354 | 991 | update_head(our_head_points_at, remote_head, reflog_msg.buf); |
1db4a75c | 992 | |
6f48d39f NTND |
993 | transport_unlock_pack(transport); |
994 | transport_disconnect(transport); | |
1db4a75c | 995 | |
d3b34622 | 996 | junk_mode = JUNK_LEAVE_REPO; |
c39852c1 | 997 | err = checkout(); |
8434c2f1 DB |
998 | |
999 | strbuf_release(&reflog_msg); | |
b5ff37ac MV |
1000 | strbuf_release(&branch_top); |
1001 | strbuf_release(&key); | |
1002 | strbuf_release(&value); | |
d3b34622 | 1003 | junk_mode = JUNK_LEAVE_ALL; |
50b67732 SB |
1004 | |
1005 | free(refspec); | |
dfa7a6c5 | 1006 | return err; |
8434c2f1 | 1007 | } |