Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 1 | /* |
| 2 | * "git fetch" |
| 3 | */ |
| 4 | #include "cache.h" |
| 5 | #include "refs.h" |
| 6 | #include "commit.h" |
| 7 | #include "builtin.h" |
Johannes Schindelin | c455c87 | 2008-07-21 19:03:49 +0100 | [diff] [blame] | 8 | #include "string-list.h" |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 9 | #include "remote.h" |
| 10 | #include "transport.h" |
Shawn O. Pearce | 4191c35 | 2007-11-11 02:29:47 -0500 | [diff] [blame] | 11 | #include "run-command.h" |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 12 | #include "parse-options.h" |
Jeff King | 4a16d07 | 2009-01-22 01:02:35 -0500 | [diff] [blame] | 13 | #include "sigchain.h" |
Michael Lukashov | f1863d0 | 2010-02-16 23:42:52 +0000 | [diff] [blame] | 14 | #include "transport.h" |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 15 | #include "submodule.h" |
Junio C Hamano | f96400c | 2011-09-02 16:33:22 -0700 | [diff] [blame] | 16 | #include "connected.h" |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 17 | #include "argv-array.h" |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 18 | |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 19 | static const char * const builtin_fetch_usage[] = { |
Nguyễn Thái Ngọc Duy | 719aced | 2012-08-20 19:32:09 +0700 | [diff] [blame] | 20 | N_("git fetch [<options>] [<repository> [<refspec>...]]"), |
| 21 | N_("git fetch [<options>] <group>"), |
| 22 | N_("git fetch --multiple [<options>] [(<repository> | <group>)...]"), |
| 23 | N_("git fetch --all [<options>]"), |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 24 | NULL |
| 25 | }; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 26 | |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 27 | enum { |
| 28 | TAGS_UNSET = 0, |
| 29 | TAGS_DEFAULT = 1, |
| 30 | TAGS_SET = 2 |
| 31 | }; |
| 32 | |
Jay Soffian | 28a1540 | 2009-11-10 09:19:43 +0100 | [diff] [blame] | 33 | static int all, append, dry_run, force, keep, multiple, prune, update_head_ok, verbosity; |
Clemens Buchacher | 01fdc21 | 2012-02-13 21:17:15 +0100 | [diff] [blame] | 34 | static int progress = -1, recurse_submodules = RECURSE_SUBMODULES_DEFAULT; |
Nguyễn Thái Ngọc Duy | 4dcb167 | 2013-01-11 16:05:46 +0700 | [diff] [blame] | 35 | static int tags = TAGS_DEFAULT, unshallow; |
Shawn O. Pearce | 4191c35 | 2007-11-11 02:29:47 -0500 | [diff] [blame] | 36 | static const char *depth; |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 37 | static const char *upload_pack; |
Kristian Høgsberg | 2d324ef | 2007-12-04 02:25:46 -0500 | [diff] [blame] | 38 | static struct strbuf default_rla = STRBUF_INIT; |
Junio C Hamano | af23445 | 2013-08-07 15:38:45 -0700 | [diff] [blame^] | 39 | static struct transport *gtransport; |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 40 | static const char *submodule_prefix = ""; |
Jens Lehmann | 88a2197 | 2011-03-06 23:10:46 +0100 | [diff] [blame] | 41 | static const char *recurse_submodules_default; |
Shawn O. Pearce | e4022ed | 2007-09-14 03:31:25 -0400 | [diff] [blame] | 42 | |
Jens Lehmann | 8f0700d | 2011-03-06 23:11:21 +0100 | [diff] [blame] | 43 | static int option_parse_recurse_submodules(const struct option *opt, |
| 44 | const char *arg, int unset) |
| 45 | { |
| 46 | if (unset) { |
| 47 | recurse_submodules = RECURSE_SUBMODULES_OFF; |
| 48 | } else { |
| 49 | if (arg) |
| 50 | recurse_submodules = parse_fetch_recurse_submodules_arg(opt->long_name, arg); |
| 51 | else |
| 52 | recurse_submodules = RECURSE_SUBMODULES_ON; |
| 53 | } |
| 54 | return 0; |
| 55 | } |
Shawn O. Pearce | e4022ed | 2007-09-14 03:31:25 -0400 | [diff] [blame] | 56 | |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 57 | static struct option builtin_fetch_options[] = { |
Tuncer Ayaz | 7f87aff | 2008-11-15 01:14:24 +0100 | [diff] [blame] | 58 | OPT__VERBOSITY(&verbosity), |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 59 | OPT_BOOLEAN(0, "all", &all, |
Nguyễn Thái Ngọc Duy | 719aced | 2012-08-20 19:32:09 +0700 | [diff] [blame] | 60 | N_("fetch from all remotes")), |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 61 | OPT_BOOLEAN('a', "append", &append, |
Nguyễn Thái Ngọc Duy | 719aced | 2012-08-20 19:32:09 +0700 | [diff] [blame] | 62 | N_("append to .git/FETCH_HEAD instead of overwriting")), |
| 63 | OPT_STRING(0, "upload-pack", &upload_pack, N_("path"), |
| 64 | N_("path to upload pack on remote end")), |
| 65 | OPT__FORCE(&force, N_("force overwrite of local branch")), |
Björn Gustavsson | 16679e3 | 2009-11-09 21:10:32 +0100 | [diff] [blame] | 66 | OPT_BOOLEAN('m', "multiple", &multiple, |
Nguyễn Thái Ngọc Duy | 719aced | 2012-08-20 19:32:09 +0700 | [diff] [blame] | 67 | N_("fetch from multiple remotes")), |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 68 | OPT_SET_INT('t', "tags", &tags, |
Nguyễn Thái Ngọc Duy | 719aced | 2012-08-20 19:32:09 +0700 | [diff] [blame] | 69 | N_("fetch all tags and associated objects"), TAGS_SET), |
Johannes Schindelin | e795129 | 2008-03-13 08:13:15 +0100 | [diff] [blame] | 70 | OPT_SET_INT('n', NULL, &tags, |
Nguyễn Thái Ngọc Duy | 719aced | 2012-08-20 19:32:09 +0700 | [diff] [blame] | 71 | N_("do not fetch all tags (--no-tags)"), TAGS_UNSET), |
Jay Soffian | f360d84 | 2009-11-10 09:15:47 +0100 | [diff] [blame] | 72 | OPT_BOOLEAN('p', "prune", &prune, |
Nguyễn Thái Ngọc Duy | 719aced | 2012-08-20 19:32:09 +0700 | [diff] [blame] | 73 | N_("prune remote-tracking branches no longer on remote")), |
| 74 | { OPTION_CALLBACK, 0, "recurse-submodules", NULL, N_("on-demand"), |
| 75 | N_("control recursive fetching of submodules"), |
Jens Lehmann | 8f0700d | 2011-03-06 23:11:21 +0100 | [diff] [blame] | 76 | PARSE_OPT_OPTARG, option_parse_recurse_submodules }, |
Jay Soffian | 28a1540 | 2009-11-10 09:19:43 +0100 | [diff] [blame] | 77 | OPT_BOOLEAN(0, "dry-run", &dry_run, |
Nguyễn Thái Ngọc Duy | 719aced | 2012-08-20 19:32:09 +0700 | [diff] [blame] | 78 | N_("dry run")), |
| 79 | OPT_BOOLEAN('k', "keep", &keep, N_("keep downloaded pack")), |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 80 | OPT_BOOLEAN('u', "update-head-ok", &update_head_ok, |
Nguyễn Thái Ngọc Duy | 719aced | 2012-08-20 19:32:09 +0700 | [diff] [blame] | 81 | N_("allow updating of HEAD ref")), |
| 82 | OPT_BOOL(0, "progress", &progress, N_("force progress reporting")), |
| 83 | OPT_STRING(0, "depth", &depth, N_("depth"), |
| 84 | N_("deepen history of shallow clone")), |
Nguyễn Thái Ngọc Duy | 4dcb167 | 2013-01-11 16:05:46 +0700 | [diff] [blame] | 85 | { OPTION_SET_INT, 0, "unshallow", &unshallow, NULL, |
| 86 | N_("convert to a complete repository"), |
| 87 | PARSE_OPT_NONEG | PARSE_OPT_NOARG, NULL, 1 }, |
Nguyễn Thái Ngọc Duy | 719aced | 2012-08-20 19:32:09 +0700 | [diff] [blame] | 88 | { OPTION_STRING, 0, "submodule-prefix", &submodule_prefix, N_("dir"), |
| 89 | N_("prepend this to submodule path output"), PARSE_OPT_HIDDEN }, |
Jens Lehmann | 88a2197 | 2011-03-06 23:10:46 +0100 | [diff] [blame] | 90 | { OPTION_STRING, 0, "recurse-submodules-default", |
| 91 | &recurse_submodules_default, NULL, |
Nguyễn Thái Ngọc Duy | 719aced | 2012-08-20 19:32:09 +0700 | [diff] [blame] | 92 | N_("default mode for recursion"), PARSE_OPT_HIDDEN }, |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 93 | OPT_END() |
| 94 | }; |
| 95 | |
Shawn O. Pearce | e4022ed | 2007-09-14 03:31:25 -0400 | [diff] [blame] | 96 | static void unlock_pack(void) |
| 97 | { |
Junio C Hamano | af23445 | 2013-08-07 15:38:45 -0700 | [diff] [blame^] | 98 | if (gtransport) |
| 99 | transport_unlock_pack(gtransport); |
Shawn O. Pearce | e4022ed | 2007-09-14 03:31:25 -0400 | [diff] [blame] | 100 | } |
| 101 | |
| 102 | static void unlock_pack_on_signal(int signo) |
| 103 | { |
| 104 | unlock_pack(); |
Jeff King | 4a16d07 | 2009-01-22 01:02:35 -0500 | [diff] [blame] | 105 | sigchain_pop(signo); |
Shawn O. Pearce | e4022ed | 2007-09-14 03:31:25 -0400 | [diff] [blame] | 106 | raise(signo); |
| 107 | } |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 108 | |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 109 | static void add_merge_config(struct ref **head, |
Daniel Barkalow | 4577370 | 2007-10-29 21:05:40 -0400 | [diff] [blame] | 110 | const struct ref *remote_refs, |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 111 | struct branch *branch, |
| 112 | struct ref ***tail) |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 113 | { |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 114 | int i; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 115 | |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 116 | for (i = 0; i < branch->merge_nr; i++) { |
| 117 | struct ref *rm, **old_tail = *tail; |
| 118 | struct refspec refspec; |
| 119 | |
| 120 | for (rm = *head; rm; rm = rm->next) { |
| 121 | if (branch_merge_matches(branch, i, rm->name)) { |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 122 | rm->fetch_head_status = FETCH_HEAD_MERGE; |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 123 | break; |
| 124 | } |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 125 | } |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 126 | if (rm) |
| 127 | continue; |
| 128 | |
Junio C Hamano | 9ad7c5a | 2007-10-26 23:09:48 -0700 | [diff] [blame] | 129 | /* |
Matthieu Moy | 8b3f3f8 | 2010-11-02 16:31:23 +0100 | [diff] [blame] | 130 | * Not fetched to a remote-tracking branch? We need to fetch |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 131 | * it anyway to allow this branch's "branch.$name.merge" |
Heikki Orsila | 05207a2 | 2008-09-09 13:28:30 +0300 | [diff] [blame] | 132 | * to be honored by 'git pull', but we do not have to |
Junio C Hamano | 9ad7c5a | 2007-10-26 23:09:48 -0700 | [diff] [blame] | 133 | * fail if branch.$name.merge is misconfigured to point |
| 134 | * at a nonexisting branch. If we were indeed called by |
Heikki Orsila | 05207a2 | 2008-09-09 13:28:30 +0300 | [diff] [blame] | 135 | * 'git pull', it will notice the misconfiguration because |
Junio C Hamano | 9ad7c5a | 2007-10-26 23:09:48 -0700 | [diff] [blame] | 136 | * there is no entry in the resulting FETCH_HEAD marked |
| 137 | * for merging. |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 138 | */ |
Andreas Gruenbacher | 8da61a2 | 2010-03-12 23:27:33 +0100 | [diff] [blame] | 139 | memset(&refspec, 0, sizeof(refspec)); |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 140 | refspec.src = branch->merge[i]->src; |
Junio C Hamano | 9ad7c5a | 2007-10-26 23:09:48 -0700 | [diff] [blame] | 141 | get_fetch_map(remote_refs, &refspec, tail, 1); |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 142 | for (rm = *old_tail; rm; rm = rm->next) |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 143 | rm->fetch_head_status = FETCH_HEAD_MERGE; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 144 | } |
| 145 | } |
| 146 | |
Shawn O. Pearce | 767f176 | 2008-03-02 21:35:25 -0500 | [diff] [blame] | 147 | static void find_non_local_tags(struct transport *transport, |
| 148 | struct ref **head, |
| 149 | struct ref ***tail); |
| 150 | |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 151 | static struct ref *get_ref_map(struct transport *transport, |
| 152 | struct refspec *refs, int ref_count, int tags, |
| 153 | int *autotags) |
| 154 | { |
| 155 | int i; |
| 156 | struct ref *rm; |
| 157 | struct ref *ref_map = NULL; |
| 158 | struct ref **tail = &ref_map; |
| 159 | |
Daniel Barkalow | 4577370 | 2007-10-29 21:05:40 -0400 | [diff] [blame] | 160 | const struct ref *remote_refs = transport_get_remote_refs(transport); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 161 | |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 162 | if (ref_count || tags == TAGS_SET) { |
Jeff King | f269048 | 2013-05-11 18:16:52 +0200 | [diff] [blame] | 163 | struct ref **old_tail; |
| 164 | |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 165 | for (i = 0; i < ref_count; i++) { |
Junio C Hamano | 9ad7c5a | 2007-10-26 23:09:48 -0700 | [diff] [blame] | 166 | get_fetch_map(remote_refs, &refs[i], &tail, 0); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 167 | if (refs[i].dst && refs[i].dst[0]) |
| 168 | *autotags = 1; |
| 169 | } |
| 170 | /* Merge everything on the command line, but not --tags */ |
| 171 | for (rm = ref_map; rm; rm = rm->next) |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 172 | rm->fetch_head_status = FETCH_HEAD_MERGE; |
Daniel Barkalow | e0aaa29 | 2008-04-17 19:32:35 -0400 | [diff] [blame] | 173 | if (tags == TAGS_SET) |
| 174 | get_fetch_map(remote_refs, tag_refspec, &tail, 0); |
Jeff King | f269048 | 2013-05-11 18:16:52 +0200 | [diff] [blame] | 175 | |
| 176 | /* |
| 177 | * For any refs that we happen to be fetching via command-line |
| 178 | * arguments, take the opportunity to update their configured |
| 179 | * counterparts. However, we do not want to mention these |
| 180 | * entries in FETCH_HEAD at all, as they would simply be |
| 181 | * duplicates of existing entries. |
| 182 | */ |
| 183 | old_tail = tail; |
| 184 | for (i = 0; i < transport->remote->fetch_refspec_nr; i++) |
| 185 | get_fetch_map(ref_map, &transport->remote->fetch[i], |
John Keeping | 823c6d5 | 2013-05-27 17:33:09 +0100 | [diff] [blame] | 186 | &tail, 1); |
Jeff King | f269048 | 2013-05-11 18:16:52 +0200 | [diff] [blame] | 187 | for (rm = *old_tail; rm; rm = rm->next) |
| 188 | rm->fetch_head_status = FETCH_HEAD_IGNORE; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 189 | } else { |
| 190 | /* Use the defaults */ |
| 191 | struct remote *remote = transport->remote; |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 192 | struct branch *branch = branch_get(NULL); |
| 193 | int has_merge = branch_has_merge_config(branch); |
Brandon Casey | 3ee1757 | 2010-08-25 12:52:56 -0500 | [diff] [blame] | 194 | if (remote && |
| 195 | (remote->fetch_refspec_nr || |
Brandon Casey | f31dbdc | 2010-09-09 13:56:36 -0500 | [diff] [blame] | 196 | /* Note: has_merge implies non-NULL branch->remote_name */ |
Brandon Casey | 3ee1757 | 2010-08-25 12:52:56 -0500 | [diff] [blame] | 197 | (has_merge && !strcmp(branch->remote_name, remote->name)))) { |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 198 | for (i = 0; i < remote->fetch_refspec_nr; i++) { |
Junio C Hamano | 9ad7c5a | 2007-10-26 23:09:48 -0700 | [diff] [blame] | 199 | get_fetch_map(remote_refs, &remote->fetch[i], &tail, 0); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 200 | if (remote->fetch[i].dst && |
| 201 | remote->fetch[i].dst[0]) |
| 202 | *autotags = 1; |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 203 | if (!i && !has_merge && ref_map && |
Daniel Barkalow | cfb8f89 | 2007-09-28 19:34:17 -0400 | [diff] [blame] | 204 | !remote->fetch[0].pattern) |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 205 | ref_map->fetch_head_status = FETCH_HEAD_MERGE; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 206 | } |
Johannes Schindelin | da0204d | 2007-10-11 01:47:55 +0100 | [diff] [blame] | 207 | /* |
| 208 | * if the remote we're fetching from is the same |
| 209 | * as given in branch.<name>.remote, we add the |
| 210 | * ref given in branch.<name>.merge, too. |
Brandon Casey | f31dbdc | 2010-09-09 13:56:36 -0500 | [diff] [blame] | 211 | * |
| 212 | * Note: has_merge implies non-NULL branch->remote_name |
Johannes Schindelin | da0204d | 2007-10-11 01:47:55 +0100 | [diff] [blame] | 213 | */ |
Junio C Hamano | 9ad7c5a | 2007-10-26 23:09:48 -0700 | [diff] [blame] | 214 | if (has_merge && |
| 215 | !strcmp(branch->remote_name, remote->name)) |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 216 | add_merge_config(&ref_map, remote_refs, branch, &tail); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 217 | } else { |
| 218 | ref_map = get_remote_ref(remote_refs, "HEAD"); |
Junio C Hamano | 9ad7c5a | 2007-10-26 23:09:48 -0700 | [diff] [blame] | 219 | if (!ref_map) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 220 | die(_("Couldn't find remote ref HEAD")); |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 221 | ref_map->fetch_head_status = FETCH_HEAD_MERGE; |
Shawn O. Pearce | 5aaf7f2 | 2008-03-02 21:34:51 -0500 | [diff] [blame] | 222 | tail = &ref_map->next; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 223 | } |
| 224 | } |
Shawn O. Pearce | 767f176 | 2008-03-02 21:35:25 -0500 | [diff] [blame] | 225 | if (tags == TAGS_DEFAULT && *autotags) |
| 226 | find_non_local_tags(transport, &ref_map, &tail); |
Daniel Barkalow | 2467a4f | 2007-10-08 00:25:07 -0400 | [diff] [blame] | 227 | ref_remove_duplicates(ref_map); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 228 | |
| 229 | return ref_map; |
| 230 | } |
| 231 | |
Jeff King | fa25075 | 2009-05-25 06:40:54 -0400 | [diff] [blame] | 232 | #define STORE_REF_ERROR_OTHER 1 |
| 233 | #define STORE_REF_ERROR_DF_CONFLICT 2 |
| 234 | |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 235 | static int s_update_ref(const char *action, |
| 236 | struct ref *ref, |
| 237 | int check_old) |
| 238 | { |
| 239 | char msg[1024]; |
| 240 | char *rla = getenv("GIT_REFLOG_ACTION"); |
| 241 | static struct ref_lock *lock; |
| 242 | |
Jay Soffian | 28a1540 | 2009-11-10 09:19:43 +0100 | [diff] [blame] | 243 | if (dry_run) |
| 244 | return 0; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 245 | if (!rla) |
Kristian Høgsberg | 2d324ef | 2007-12-04 02:25:46 -0500 | [diff] [blame] | 246 | rla = default_rla.buf; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 247 | snprintf(msg, sizeof(msg), "%s: %s", rla, action); |
| 248 | lock = lock_any_ref_for_update(ref->name, |
| 249 | check_old ? ref->old_sha1 : NULL, 0); |
| 250 | if (!lock) |
Jeff King | fa25075 | 2009-05-25 06:40:54 -0400 | [diff] [blame] | 251 | return errno == ENOTDIR ? STORE_REF_ERROR_DF_CONFLICT : |
| 252 | STORE_REF_ERROR_OTHER; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 253 | if (write_ref_sha1(lock, ref->new_sha1, msg) < 0) |
Jeff King | fa25075 | 2009-05-25 06:40:54 -0400 | [diff] [blame] | 254 | return errno == ENOTDIR ? STORE_REF_ERROR_DF_CONFLICT : |
| 255 | STORE_REF_ERROR_OTHER; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 256 | return 0; |
| 257 | } |
| 258 | |
Pierre Habouzit | 9ef4272 | 2007-11-04 15:05:45 -0800 | [diff] [blame] | 259 | #define REFCOL_WIDTH 10 |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 260 | |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 261 | static int update_local_ref(struct ref *ref, |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 262 | const char *remote, |
Marc Branchaud | 6da618d | 2012-04-16 18:08:49 -0400 | [diff] [blame] | 263 | const struct ref *remote_ref, |
Jeff King | 5914f2d | 2011-12-08 03:43:19 -0500 | [diff] [blame] | 264 | struct strbuf *display) |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 265 | { |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 266 | struct commit *current = NULL, *updated; |
| 267 | enum object_type type; |
| 268 | struct branch *current_branch = branch_get(NULL); |
Felipe Contreras | 4577e48 | 2009-05-14 00:22:04 +0300 | [diff] [blame] | 269 | const char *pretty_ref = prettify_refname(ref->name); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 270 | |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 271 | type = sha1_object_info(ref->new_sha1, NULL); |
| 272 | if (type < 0) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 273 | die(_("object %s not found"), sha1_to_hex(ref->new_sha1)); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 274 | |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 275 | if (!hashcmp(ref->old_sha1, ref->new_sha1)) { |
Tuncer Ayaz | 7f87aff | 2008-11-15 01:14:24 +0100 | [diff] [blame] | 276 | if (verbosity > 0) |
Jeff King | 5914f2d | 2011-12-08 03:43:19 -0500 | [diff] [blame] | 277 | strbuf_addf(display, "= %-*s %-*s -> %s", |
Nguyễn Thái Ngọc Duy | 754395d | 2012-09-04 17:39:35 +0700 | [diff] [blame] | 278 | TRANSPORT_SUMMARY(_("[up to date]")), |
| 279 | REFCOL_WIDTH, remote, pretty_ref); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 280 | return 0; |
| 281 | } |
| 282 | |
Shawn O. Pearce | b3abdd9 | 2007-09-16 02:31:26 -0400 | [diff] [blame] | 283 | if (current_branch && |
| 284 | !strcmp(ref->name, current_branch->name) && |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 285 | !(update_head_ok || is_bare_repository()) && |
| 286 | !is_null_sha1(ref->old_sha1)) { |
| 287 | /* |
| 288 | * If this is the head, and it's not okay to update |
| 289 | * the head, and the old value of the head isn't empty... |
| 290 | */ |
Jeff King | 5914f2d | 2011-12-08 03:43:19 -0500 | [diff] [blame] | 291 | strbuf_addf(display, |
| 292 | _("! %-*s %-*s -> %s (can't fetch in current branch)"), |
Nguyễn Thái Ngọc Duy | 754395d | 2012-09-04 17:39:35 +0700 | [diff] [blame] | 293 | TRANSPORT_SUMMARY(_("[rejected]")), |
Jeff King | 5914f2d | 2011-12-08 03:43:19 -0500 | [diff] [blame] | 294 | REFCOL_WIDTH, remote, pretty_ref); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 295 | return 1; |
| 296 | } |
| 297 | |
| 298 | if (!is_null_sha1(ref->old_sha1) && |
| 299 | !prefixcmp(ref->name, "refs/tags/")) { |
Jeff King | 6315472 | 2008-06-26 23:59:50 -0400 | [diff] [blame] | 300 | int r; |
| 301 | r = s_update_ref("updating tag", ref, 0); |
Jeff King | 5914f2d | 2011-12-08 03:43:19 -0500 | [diff] [blame] | 302 | strbuf_addf(display, "%c %-*s %-*s -> %s%s", |
| 303 | r ? '!' : '-', |
Nguyễn Thái Ngọc Duy | 754395d | 2012-09-04 17:39:35 +0700 | [diff] [blame] | 304 | TRANSPORT_SUMMARY(_("[tag update]")), |
Jeff King | 5914f2d | 2011-12-08 03:43:19 -0500 | [diff] [blame] | 305 | REFCOL_WIDTH, remote, pretty_ref, |
| 306 | r ? _(" (unable to update local ref)") : ""); |
Jeff King | 6315472 | 2008-06-26 23:59:50 -0400 | [diff] [blame] | 307 | return r; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 308 | } |
| 309 | |
Shawn O. Pearce | cfa5b2b | 2007-10-19 00:54:59 -0400 | [diff] [blame] | 310 | current = lookup_commit_reference_gently(ref->old_sha1, 1); |
| 311 | updated = lookup_commit_reference_gently(ref->new_sha1, 1); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 312 | if (!current || !updated) { |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 313 | const char *msg; |
| 314 | const char *what; |
Jeff King | 6315472 | 2008-06-26 23:59:50 -0400 | [diff] [blame] | 315 | int r; |
Marc Branchaud | 0997ada | 2012-04-16 18:08:50 -0400 | [diff] [blame] | 316 | /* |
| 317 | * Nicely describe the new ref we're fetching. |
| 318 | * Base this on the remote's ref name, as it's |
| 319 | * more likely to follow a standard layout. |
| 320 | */ |
| 321 | const char *name = remote_ref ? remote_ref->name : ""; |
| 322 | if (!prefixcmp(name, "refs/tags/")) { |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 323 | msg = "storing tag"; |
Ævar Arnfjörð Bjarmason | f7b3742 | 2011-02-22 23:41:53 +0000 | [diff] [blame] | 324 | what = _("[new tag]"); |
Marc Branchaud | 0997ada | 2012-04-16 18:08:50 -0400 | [diff] [blame] | 325 | } else if (!prefixcmp(name, "refs/heads/")) { |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 326 | msg = "storing head"; |
Ævar Arnfjörð Bjarmason | f7b3742 | 2011-02-22 23:41:53 +0000 | [diff] [blame] | 327 | what = _("[new branch]"); |
Marc Branchaud | 0997ada | 2012-04-16 18:08:50 -0400 | [diff] [blame] | 328 | } else { |
| 329 | msg = "storing ref"; |
| 330 | what = _("[new ref]"); |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 331 | } |
| 332 | |
Jens Lehmann | a6801ad | 2012-04-13 18:25:16 +0200 | [diff] [blame] | 333 | if ((recurse_submodules != RECURSE_SUBMODULES_OFF) && |
| 334 | (recurse_submodules != RECURSE_SUBMODULES_ON)) |
| 335 | check_for_new_submodule_commits(ref->new_sha1); |
Jeff King | 6315472 | 2008-06-26 23:59:50 -0400 | [diff] [blame] | 336 | r = s_update_ref(msg, ref, 0); |
Jeff King | 5914f2d | 2011-12-08 03:43:19 -0500 | [diff] [blame] | 337 | strbuf_addf(display, "%c %-*s %-*s -> %s%s", |
| 338 | r ? '!' : '*', |
Nguyễn Thái Ngọc Duy | 754395d | 2012-09-04 17:39:35 +0700 | [diff] [blame] | 339 | TRANSPORT_SUMMARY(what), |
Jeff King | 5914f2d | 2011-12-08 03:43:19 -0500 | [diff] [blame] | 340 | REFCOL_WIDTH, remote, pretty_ref, |
| 341 | r ? _(" (unable to update local ref)") : ""); |
Jeff King | 6315472 | 2008-06-26 23:59:50 -0400 | [diff] [blame] | 342 | return r; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 343 | } |
| 344 | |
Junio C Hamano | a20efee | 2012-08-27 14:46:01 -0700 | [diff] [blame] | 345 | if (in_merge_bases(current, updated)) { |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 346 | char quickref[83]; |
Jeff King | 6315472 | 2008-06-26 23:59:50 -0400 | [diff] [blame] | 347 | int r; |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 348 | strcpy(quickref, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV)); |
| 349 | strcat(quickref, ".."); |
| 350 | strcat(quickref, find_unique_abbrev(ref->new_sha1, DEFAULT_ABBREV)); |
Jens Lehmann | 88a2197 | 2011-03-06 23:10:46 +0100 | [diff] [blame] | 351 | if ((recurse_submodules != RECURSE_SUBMODULES_OFF) && |
| 352 | (recurse_submodules != RECURSE_SUBMODULES_ON)) |
| 353 | check_for_new_submodule_commits(ref->new_sha1); |
Felipe Contreras | a75d7b5 | 2009-10-24 11:31:32 +0300 | [diff] [blame] | 354 | r = s_update_ref("fast-forward", ref, 1); |
Jeff King | 5914f2d | 2011-12-08 03:43:19 -0500 | [diff] [blame] | 355 | strbuf_addf(display, "%c %-*s %-*s -> %s%s", |
| 356 | r ? '!' : ' ', |
| 357 | TRANSPORT_SUMMARY_WIDTH, quickref, |
| 358 | REFCOL_WIDTH, remote, pretty_ref, |
| 359 | r ? _(" (unable to update local ref)") : ""); |
Jeff King | 6315472 | 2008-06-26 23:59:50 -0400 | [diff] [blame] | 360 | return r; |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 361 | } else if (force || ref->force) { |
| 362 | char quickref[84]; |
Jeff King | 6315472 | 2008-06-26 23:59:50 -0400 | [diff] [blame] | 363 | int r; |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 364 | strcpy(quickref, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV)); |
| 365 | strcat(quickref, "..."); |
| 366 | strcat(quickref, find_unique_abbrev(ref->new_sha1, DEFAULT_ABBREV)); |
Jens Lehmann | 88a2197 | 2011-03-06 23:10:46 +0100 | [diff] [blame] | 367 | if ((recurse_submodules != RECURSE_SUBMODULES_OFF) && |
| 368 | (recurse_submodules != RECURSE_SUBMODULES_ON)) |
| 369 | check_for_new_submodule_commits(ref->new_sha1); |
Jeff King | 6315472 | 2008-06-26 23:59:50 -0400 | [diff] [blame] | 370 | r = s_update_ref("forced-update", ref, 1); |
Jeff King | 5914f2d | 2011-12-08 03:43:19 -0500 | [diff] [blame] | 371 | strbuf_addf(display, "%c %-*s %-*s -> %s (%s)", |
| 372 | r ? '!' : '+', |
| 373 | TRANSPORT_SUMMARY_WIDTH, quickref, |
| 374 | REFCOL_WIDTH, remote, pretty_ref, |
| 375 | r ? _("unable to update local ref") : _("forced update")); |
Jeff King | 6315472 | 2008-06-26 23:59:50 -0400 | [diff] [blame] | 376 | return r; |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 377 | } else { |
Jeff King | 5914f2d | 2011-12-08 03:43:19 -0500 | [diff] [blame] | 378 | strbuf_addf(display, "! %-*s %-*s -> %s %s", |
Nguyễn Thái Ngọc Duy | 754395d | 2012-09-04 17:39:35 +0700 | [diff] [blame] | 379 | TRANSPORT_SUMMARY(_("[rejected]")), |
Jeff King | 5914f2d | 2011-12-08 03:43:19 -0500 | [diff] [blame] | 380 | REFCOL_WIDTH, remote, pretty_ref, |
| 381 | _("(non-fast-forward)")); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 382 | return 1; |
| 383 | } |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 384 | } |
| 385 | |
Junio C Hamano | f0e278b | 2011-09-02 16:22:47 -0700 | [diff] [blame] | 386 | static int iterate_ref_map(void *cb_data, unsigned char sha1[20]) |
Junio C Hamano | 6b67e0d | 2011-09-01 15:43:35 -0700 | [diff] [blame] | 387 | { |
Junio C Hamano | f0e278b | 2011-09-02 16:22:47 -0700 | [diff] [blame] | 388 | struct ref **rm = cb_data; |
| 389 | struct ref *ref = *rm; |
Junio C Hamano | 6b67e0d | 2011-09-01 15:43:35 -0700 | [diff] [blame] | 390 | |
Junio C Hamano | f0e278b | 2011-09-02 16:22:47 -0700 | [diff] [blame] | 391 | if (!ref) |
| 392 | return -1; /* end of the list */ |
| 393 | *rm = ref->next; |
| 394 | hashcpy(sha1, ref->old_sha1); |
| 395 | return 0; |
Junio C Hamano | 6b67e0d | 2011-09-01 15:43:35 -0700 | [diff] [blame] | 396 | } |
| 397 | |
Andreas Ericsson | 47abd85 | 2009-04-17 10:20:11 +0200 | [diff] [blame] | 398 | static int store_updated_refs(const char *raw_url, const char *remote_name, |
Jeff King | f3cb169 | 2008-06-27 00:01:41 -0400 | [diff] [blame] | 399 | struct ref *ref_map) |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 400 | { |
| 401 | FILE *fp; |
| 402 | struct commit *commit; |
Jeff King | 5914f2d | 2011-12-08 03:43:19 -0500 | [diff] [blame] | 403 | int url_len, i, shown_url = 0, rc = 0; |
| 404 | struct strbuf note = STRBUF_INIT; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 405 | const char *what, *kind; |
| 406 | struct ref *rm; |
Jay Soffian | 28a1540 | 2009-11-10 09:19:43 +0100 | [diff] [blame] | 407 | char *url, *filename = dry_run ? "/dev/null" : git_path("FETCH_HEAD"); |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 408 | int want_status; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 409 | |
André Goddard Rosa | d6617c7 | 2007-11-22 20:22:23 -0200 | [diff] [blame] | 410 | fp = fopen(filename, "a"); |
| 411 | if (!fp) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 412 | return error(_("cannot open %s: %s\n"), filename, strerror(errno)); |
Andreas Ericsson | 47abd85 | 2009-04-17 10:20:11 +0200 | [diff] [blame] | 413 | |
Daniel Barkalow | fb0cc87 | 2009-11-18 02:42:22 +0100 | [diff] [blame] | 414 | if (raw_url) |
| 415 | url = transport_anonymize_url(raw_url); |
| 416 | else |
| 417 | url = xstrdup("foreign"); |
Junio C Hamano | 6b67e0d | 2011-09-01 15:43:35 -0700 | [diff] [blame] | 418 | |
Junio C Hamano | f0e278b | 2011-09-02 16:22:47 -0700 | [diff] [blame] | 419 | rm = ref_map; |
Junio C Hamano | 3f7d11c | 2011-10-17 21:37:12 -0700 | [diff] [blame] | 420 | if (check_everything_connected(iterate_ref_map, 0, &rm)) { |
Tay Ray Chuan | 9516a59 | 2011-10-07 15:40:22 +0800 | [diff] [blame] | 421 | rc = error(_("%s did not send all necessary objects\n"), url); |
| 422 | goto abort; |
| 423 | } |
Junio C Hamano | 6b67e0d | 2011-09-01 15:43:35 -0700 | [diff] [blame] | 424 | |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 425 | /* |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 426 | * We do a pass for each fetch_head_status type in their enum order, so |
| 427 | * merged entries are written before not-for-merge. That lets readers |
| 428 | * use FETCH_HEAD as a refname to refer to the ref to be merged. |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 429 | */ |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 430 | for (want_status = FETCH_HEAD_MERGE; |
| 431 | want_status <= FETCH_HEAD_IGNORE; |
| 432 | want_status++) { |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 433 | for (rm = ref_map; rm; rm = rm->next) { |
| 434 | struct ref *ref = NULL; |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 435 | const char *merge_status_marker = ""; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 436 | |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 437 | commit = lookup_commit_reference_gently(rm->old_sha1, 1); |
| 438 | if (!commit) |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 439 | rm->fetch_head_status = FETCH_HEAD_NOT_FOR_MERGE; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 440 | |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 441 | if (rm->fetch_head_status != want_status) |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 442 | continue; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 443 | |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 444 | if (rm->peer_ref) { |
| 445 | ref = xcalloc(1, sizeof(*ref) + strlen(rm->peer_ref->name) + 1); |
| 446 | strcpy(ref->name, rm->peer_ref->name); |
| 447 | hashcpy(ref->old_sha1, rm->peer_ref->old_sha1); |
| 448 | hashcpy(ref->new_sha1, rm->old_sha1); |
| 449 | ref->force = rm->peer_ref->force; |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 450 | } |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 451 | |
| 452 | |
| 453 | if (!strcmp(rm->name, "HEAD")) { |
| 454 | kind = ""; |
| 455 | what = ""; |
| 456 | } |
| 457 | else if (!prefixcmp(rm->name, "refs/heads/")) { |
| 458 | kind = "branch"; |
| 459 | what = rm->name + 11; |
| 460 | } |
| 461 | else if (!prefixcmp(rm->name, "refs/tags/")) { |
| 462 | kind = "tag"; |
| 463 | what = rm->name + 10; |
| 464 | } |
| 465 | else if (!prefixcmp(rm->name, "refs/remotes/")) { |
| 466 | kind = "remote-tracking branch"; |
| 467 | what = rm->name + 13; |
| 468 | } |
| 469 | else { |
| 470 | kind = ""; |
| 471 | what = rm->name; |
| 472 | } |
| 473 | |
| 474 | url_len = strlen(url); |
| 475 | for (i = url_len - 1; url[i] == '/' && 0 <= i; i--) |
| 476 | ; |
| 477 | url_len = i + 1; |
| 478 | if (4 < i && !strncmp(".git", url + i - 3, 4)) |
| 479 | url_len = i - 3; |
| 480 | |
| 481 | strbuf_reset(¬e); |
| 482 | if (*what) { |
| 483 | if (*kind) |
| 484 | strbuf_addf(¬e, "%s ", kind); |
| 485 | strbuf_addf(¬e, "'%s' of ", what); |
| 486 | } |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 487 | switch (rm->fetch_head_status) { |
| 488 | case FETCH_HEAD_NOT_FOR_MERGE: |
| 489 | merge_status_marker = "not-for-merge"; |
| 490 | /* fall-through */ |
| 491 | case FETCH_HEAD_MERGE: |
| 492 | fprintf(fp, "%s\t%s\t%s", |
| 493 | sha1_to_hex(rm->old_sha1), |
| 494 | merge_status_marker, |
| 495 | note.buf); |
| 496 | for (i = 0; i < url_len; ++i) |
| 497 | if ('\n' == url[i]) |
| 498 | fputs("\\n", fp); |
| 499 | else |
| 500 | fputc(url[i], fp); |
| 501 | fputc('\n', fp); |
| 502 | break; |
| 503 | default: |
| 504 | /* do not write anything to FETCH_HEAD */ |
| 505 | break; |
| 506 | } |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 507 | |
| 508 | strbuf_reset(¬e); |
| 509 | if (ref) { |
Marc Branchaud | 6da618d | 2012-04-16 18:08:49 -0400 | [diff] [blame] | 510 | rc |= update_local_ref(ref, what, rm, ¬e); |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 511 | free(ref); |
| 512 | } else |
| 513 | strbuf_addf(¬e, "* %-*s %-*s -> FETCH_HEAD", |
| 514 | TRANSPORT_SUMMARY_WIDTH, |
| 515 | *kind ? kind : "branch", |
| 516 | REFCOL_WIDTH, |
| 517 | *what ? what : "HEAD"); |
| 518 | if (note.len) { |
| 519 | if (verbosity >= 0 && !shown_url) { |
| 520 | fprintf(stderr, _("From %.*s\n"), |
| 521 | url_len, url); |
| 522 | shown_url = 1; |
| 523 | } |
| 524 | if (verbosity >= 0) |
| 525 | fprintf(stderr, " %s\n", note.buf); |
| 526 | } |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 527 | } |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 528 | } |
Tay Ray Chuan | 9516a59 | 2011-10-07 15:40:22 +0800 | [diff] [blame] | 529 | |
Jeff King | fa25075 | 2009-05-25 06:40:54 -0400 | [diff] [blame] | 530 | if (rc & STORE_REF_ERROR_DF_CONFLICT) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 531 | error(_("some local refs could not be updated; try running\n" |
Jeff King | f3cb169 | 2008-06-27 00:01:41 -0400 | [diff] [blame] | 532 | " 'git remote prune %s' to remove any old, conflicting " |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 533 | "branches"), remote_name); |
Tay Ray Chuan | 9516a59 | 2011-10-07 15:40:22 +0800 | [diff] [blame] | 534 | |
| 535 | abort: |
Jeff King | 5914f2d | 2011-12-08 03:43:19 -0500 | [diff] [blame] | 536 | strbuf_release(¬e); |
Tay Ray Chuan | 9516a59 | 2011-10-07 15:40:22 +0800 | [diff] [blame] | 537 | free(url); |
| 538 | fclose(fp); |
Dmitry V. Levin | efb98b4 | 2008-05-28 19:29:36 +0400 | [diff] [blame] | 539 | return rc; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 540 | } |
| 541 | |
Shawn O. Pearce | 4191c35 | 2007-11-11 02:29:47 -0500 | [diff] [blame] | 542 | /* |
| 543 | * We would want to bypass the object transfer altogether if |
Johan Herland | d9eb020 | 2009-07-10 01:52:30 +0200 | [diff] [blame] | 544 | * everything we are going to fetch already exists and is connected |
Shawn O. Pearce | 4191c35 | 2007-11-11 02:29:47 -0500 | [diff] [blame] | 545 | * locally. |
Shawn O. Pearce | 4191c35 | 2007-11-11 02:29:47 -0500 | [diff] [blame] | 546 | */ |
| 547 | static int quickfetch(struct ref *ref_map) |
| 548 | { |
Junio C Hamano | f0e278b | 2011-09-02 16:22:47 -0700 | [diff] [blame] | 549 | struct ref *rm = ref_map; |
| 550 | |
Shawn O. Pearce | 4191c35 | 2007-11-11 02:29:47 -0500 | [diff] [blame] | 551 | /* |
| 552 | * If we are deepening a shallow clone we already have these |
| 553 | * objects reachable. Running rev-list here will return with |
| 554 | * a good (0) exit status and we'll bypass the fetch that we |
| 555 | * really need to perform. Claiming failure now will ensure |
| 556 | * we perform the network exchange to deepen our history. |
| 557 | */ |
| 558 | if (depth) |
| 559 | return -1; |
Junio C Hamano | f0e278b | 2011-09-02 16:22:47 -0700 | [diff] [blame] | 560 | return check_everything_connected(iterate_ref_map, 1, &rm); |
Shawn O. Pearce | 4191c35 | 2007-11-11 02:29:47 -0500 | [diff] [blame] | 561 | } |
| 562 | |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 563 | static int fetch_refs(struct transport *transport, struct ref *ref_map) |
| 564 | { |
Shawn O. Pearce | 4191c35 | 2007-11-11 02:29:47 -0500 | [diff] [blame] | 565 | int ret = quickfetch(ref_map); |
| 566 | if (ret) |
| 567 | ret = transport_fetch_refs(transport, ref_map); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 568 | if (!ret) |
Jeff King | f3cb169 | 2008-06-27 00:01:41 -0400 | [diff] [blame] | 569 | ret |= store_updated_refs(transport->url, |
| 570 | transport->remote->name, |
| 571 | ref_map); |
Shawn O. Pearce | 1788c39 | 2007-09-14 03:31:23 -0400 | [diff] [blame] | 572 | transport_unlock_pack(transport); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 573 | return ret; |
| 574 | } |
| 575 | |
Carlos Martín Nieto | ed43de6 | 2011-10-15 07:04:25 +0200 | [diff] [blame] | 576 | static int prune_refs(struct refspec *refs, int ref_count, struct ref *ref_map) |
Jay Soffian | f360d84 | 2009-11-10 09:15:47 +0100 | [diff] [blame] | 577 | { |
| 578 | int result = 0; |
Carlos Martín Nieto | ed43de6 | 2011-10-15 07:04:25 +0200 | [diff] [blame] | 579 | struct ref *ref, *stale_refs = get_stale_heads(refs, ref_count, ref_map); |
Jay Soffian | f360d84 | 2009-11-10 09:15:47 +0100 | [diff] [blame] | 580 | const char *dangling_msg = dry_run |
Nguyễn Thái Ngọc Duy | 18986d5 | 2012-04-23 19:30:25 +0700 | [diff] [blame] | 581 | ? _(" (%s will become dangling)") |
| 582 | : _(" (%s has become dangling)"); |
Jay Soffian | f360d84 | 2009-11-10 09:15:47 +0100 | [diff] [blame] | 583 | |
| 584 | for (ref = stale_refs; ref; ref = ref->next) { |
| 585 | if (!dry_run) |
| 586 | result |= delete_ref(ref->name, NULL, 0); |
| 587 | if (verbosity >= 0) { |
| 588 | fprintf(stderr, " x %-*s %-*s -> %s\n", |
Nguyễn Thái Ngọc Duy | 754395d | 2012-09-04 17:39:35 +0700 | [diff] [blame] | 589 | TRANSPORT_SUMMARY(_("[deleted]")), |
Ævar Arnfjörð Bjarmason | 502681c | 2011-02-22 23:41:52 +0000 | [diff] [blame] | 590 | REFCOL_WIDTH, _("(none)"), prettify_refname(ref->name)); |
Jay Soffian | f360d84 | 2009-11-10 09:15:47 +0100 | [diff] [blame] | 591 | warn_dangling_symref(stderr, dangling_msg, ref->name); |
| 592 | } |
| 593 | } |
| 594 | free_refs(stale_refs); |
| 595 | return result; |
| 596 | } |
| 597 | |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 598 | static int add_existing(const char *refname, const unsigned char *sha1, |
| 599 | int flag, void *cbdata) |
| 600 | { |
Johannes Schindelin | c455c87 | 2008-07-21 19:03:49 +0100 | [diff] [blame] | 601 | struct string_list *list = (struct string_list *)cbdata; |
Julian Phillips | 78a395d | 2010-06-26 00:41:35 +0100 | [diff] [blame] | 602 | struct string_list_item *item = string_list_insert(list, refname); |
Michael Haggerty | f83918e | 2013-05-25 11:08:17 +0200 | [diff] [blame] | 603 | item->util = xmalloc(20); |
| 604 | hashcpy(item->util, sha1); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 605 | return 0; |
| 606 | } |
| 607 | |
Shawn O. Pearce | cf7f929 | 2008-03-02 21:35:33 -0500 | [diff] [blame] | 608 | static int will_fetch(struct ref **head, const unsigned char *sha1) |
| 609 | { |
| 610 | struct ref *rm = *head; |
| 611 | while (rm) { |
| 612 | if (!hashcmp(rm->old_sha1, sha1)) |
| 613 | return 1; |
| 614 | rm = rm->next; |
| 615 | } |
| 616 | return 0; |
| 617 | } |
| 618 | |
Shawn O. Pearce | c50b2b4 | 2008-03-02 21:35:00 -0500 | [diff] [blame] | 619 | static void find_non_local_tags(struct transport *transport, |
| 620 | struct ref **head, |
| 621 | struct ref ***tail) |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 622 | { |
Michael Haggerty | b87dbcc | 2013-05-25 11:08:01 +0200 | [diff] [blame] | 623 | struct string_list existing_refs = STRING_LIST_INIT_DUP; |
Thiago Farina | 183113a | 2010-07-04 16:46:19 -0300 | [diff] [blame] | 624 | struct string_list remote_refs = STRING_LIST_INIT_NODUP; |
Daniel Barkalow | 4577370 | 2007-10-29 21:05:40 -0400 | [diff] [blame] | 625 | const struct ref *ref; |
Julian Phillips | e984c54 | 2009-09-17 08:33:19 +0100 | [diff] [blame] | 626 | struct string_list_item *item = NULL; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 627 | |
| 628 | for_each_ref(add_existing, &existing_refs); |
| 629 | for (ref = transport_get_remote_refs(transport); ref; ref = ref->next) { |
Nguyễn Thái Ngọc Duy | 97ba642 | 2012-01-05 19:39:40 +0700 | [diff] [blame] | 630 | if (prefixcmp(ref->name, "refs/tags/")) |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 631 | continue; |
| 632 | |
Julian Phillips | e984c54 | 2009-09-17 08:33:19 +0100 | [diff] [blame] | 633 | /* |
| 634 | * The peeled ref always follows the matching base |
| 635 | * ref, so if we see a peeled ref that we don't want |
| 636 | * to fetch then we can mark the ref entry in the list |
| 637 | * as one to ignore by setting util to NULL. |
| 638 | */ |
Andreas Gruenbacher | aac1d7b | 2010-03-13 18:17:04 +0100 | [diff] [blame] | 639 | if (!suffixcmp(ref->name, "^{}")) { |
Julian Phillips | e984c54 | 2009-09-17 08:33:19 +0100 | [diff] [blame] | 640 | if (item && !has_sha1_file(ref->old_sha1) && |
| 641 | !will_fetch(head, ref->old_sha1) && |
| 642 | !has_sha1_file(item->util) && |
| 643 | !will_fetch(head, item->util)) |
| 644 | item->util = NULL; |
| 645 | item = NULL; |
| 646 | continue; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 647 | } |
| 648 | |
Julian Phillips | e984c54 | 2009-09-17 08:33:19 +0100 | [diff] [blame] | 649 | /* |
| 650 | * If item is non-NULL here, then we previously saw a |
| 651 | * ref not followed by a peeled reference, so we need |
| 652 | * to check if it is a lightweight tag that we want to |
| 653 | * fetch. |
| 654 | */ |
| 655 | if (item && !has_sha1_file(item->util) && |
| 656 | !will_fetch(head, item->util)) |
| 657 | item->util = NULL; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 658 | |
Julian Phillips | e984c54 | 2009-09-17 08:33:19 +0100 | [diff] [blame] | 659 | item = NULL; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 660 | |
Julian Phillips | e984c54 | 2009-09-17 08:33:19 +0100 | [diff] [blame] | 661 | /* skip duplicates and refs that we already have */ |
| 662 | if (string_list_has_string(&remote_refs, ref->name) || |
| 663 | string_list_has_string(&existing_refs, ref->name)) |
| 664 | continue; |
| 665 | |
Julian Phillips | 78a395d | 2010-06-26 00:41:35 +0100 | [diff] [blame] | 666 | item = string_list_insert(&remote_refs, ref->name); |
Julian Phillips | e984c54 | 2009-09-17 08:33:19 +0100 | [diff] [blame] | 667 | item->util = (void *)ref->old_sha1; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 668 | } |
Michael Haggerty | f83918e | 2013-05-25 11:08:17 +0200 | [diff] [blame] | 669 | string_list_clear(&existing_refs, 1); |
Julian Phillips | e984c54 | 2009-09-17 08:33:19 +0100 | [diff] [blame] | 670 | |
| 671 | /* |
| 672 | * We may have a final lightweight tag that needs to be |
| 673 | * checked to see if it needs fetching. |
| 674 | */ |
| 675 | if (item && !has_sha1_file(item->util) && |
| 676 | !will_fetch(head, item->util)) |
| 677 | item->util = NULL; |
| 678 | |
| 679 | /* |
Alex Riesen | 8a57c6e | 2010-07-03 14:41:54 +0200 | [diff] [blame] | 680 | * For all the tags in the remote_refs string list, |
| 681 | * add them to the list of refs to be fetched |
Julian Phillips | e984c54 | 2009-09-17 08:33:19 +0100 | [diff] [blame] | 682 | */ |
Alex Riesen | 8a57c6e | 2010-07-03 14:41:54 +0200 | [diff] [blame] | 683 | for_each_string_list_item(item, &remote_refs) { |
| 684 | /* Unless we have already decided to ignore this item... */ |
| 685 | if (item->util) |
| 686 | { |
| 687 | struct ref *rm = alloc_ref(item->string); |
| 688 | rm->peer_ref = alloc_ref(item->string); |
| 689 | hashcpy(rm->old_sha1, item->util); |
| 690 | **tail = rm; |
| 691 | *tail = &rm->next; |
| 692 | } |
| 693 | } |
Julian Phillips | e984c54 | 2009-09-17 08:33:19 +0100 | [diff] [blame] | 694 | |
| 695 | string_list_clear(&remote_refs, 0); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 696 | } |
| 697 | |
Johannes Schindelin | 8ee5d73 | 2008-10-13 11:36:52 +0200 | [diff] [blame] | 698 | static void check_not_current_branch(struct ref *ref_map) |
| 699 | { |
| 700 | struct branch *current_branch = branch_get(NULL); |
| 701 | |
| 702 | if (is_bare_repository() || !current_branch) |
| 703 | return; |
| 704 | |
| 705 | for (; ref_map; ref_map = ref_map->next) |
| 706 | if (ref_map->peer_ref && !strcmp(current_branch->refname, |
| 707 | ref_map->peer_ref->name)) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 708 | die(_("Refusing to fetch into current branch %s " |
| 709 | "of non-bare repository"), current_branch->refname); |
Johannes Schindelin | 8ee5d73 | 2008-10-13 11:36:52 +0200 | [diff] [blame] | 710 | } |
| 711 | |
Junio C Hamano | e6cc510 | 2010-02-24 11:02:05 -0800 | [diff] [blame] | 712 | static int truncate_fetch_head(void) |
| 713 | { |
| 714 | char *filename = git_path("FETCH_HEAD"); |
| 715 | FILE *fp = fopen(filename, "w"); |
| 716 | |
| 717 | if (!fp) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 718 | return error(_("cannot open %s: %s\n"), filename, strerror(errno)); |
Junio C Hamano | e6cc510 | 2010-02-24 11:02:05 -0800 | [diff] [blame] | 719 | fclose(fp); |
| 720 | return 0; |
| 721 | } |
| 722 | |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 723 | static int do_fetch(struct transport *transport, |
| 724 | struct refspec *refs, int ref_count) |
| 725 | { |
Michael Haggerty | b87dbcc | 2013-05-25 11:08:01 +0200 | [diff] [blame] | 726 | struct string_list existing_refs = STRING_LIST_INIT_DUP; |
Shawn O. Pearce | 7f98428 | 2008-03-02 21:34:43 -0500 | [diff] [blame] | 727 | struct ref *ref_map; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 728 | struct ref *rm; |
| 729 | int autotags = (transport->remote->fetch_tags == 1); |
Michael Haggerty | 5b87d8d | 2013-05-25 11:08:16 +0200 | [diff] [blame] | 730 | int retcode = 0; |
Julian Phillips | b1a01e1 | 2009-10-25 21:28:12 +0000 | [diff] [blame] | 731 | |
| 732 | for_each_ref(add_existing, &existing_refs); |
| 733 | |
Daniel Johnson | ed36854 | 2010-08-11 18:57:20 -0400 | [diff] [blame] | 734 | if (tags == TAGS_DEFAULT) { |
| 735 | if (transport->remote->fetch_tags == 2) |
| 736 | tags = TAGS_SET; |
| 737 | if (transport->remote->fetch_tags == -1) |
| 738 | tags = TAGS_UNSET; |
| 739 | } |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 740 | |
Shawn O. Pearce | 824d577 | 2007-09-19 00:49:31 -0400 | [diff] [blame] | 741 | if (!transport->get_refs_list || !transport->fetch) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 742 | die(_("Don't know how to fetch from %s"), transport->url); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 743 | |
| 744 | /* if not appending, truncate FETCH_HEAD */ |
Jay Soffian | 28a1540 | 2009-11-10 09:19:43 +0100 | [diff] [blame] | 745 | if (!append && !dry_run) { |
Michael Haggerty | 5b87d8d | 2013-05-25 11:08:16 +0200 | [diff] [blame] | 746 | retcode = truncate_fetch_head(); |
| 747 | if (retcode) |
| 748 | goto cleanup; |
André Goddard Rosa | d6617c7 | 2007-11-22 20:22:23 -0200 | [diff] [blame] | 749 | } |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 750 | |
| 751 | ref_map = get_ref_map(transport, refs, ref_count, tags, &autotags); |
Johannes Schindelin | 8ee5d73 | 2008-10-13 11:36:52 +0200 | [diff] [blame] | 752 | if (!update_head_ok) |
| 753 | check_not_current_branch(ref_map); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 754 | |
| 755 | for (rm = ref_map; rm; rm = rm->next) { |
Julian Phillips | b1a01e1 | 2009-10-25 21:28:12 +0000 | [diff] [blame] | 756 | if (rm->peer_ref) { |
Michael Haggerty | 6f64a16 | 2013-05-25 11:08:15 +0200 | [diff] [blame] | 757 | struct string_list_item *peer_item = |
| 758 | string_list_lookup(&existing_refs, |
| 759 | rm->peer_ref->name); |
Julian Phillips | b1a01e1 | 2009-10-25 21:28:12 +0000 | [diff] [blame] | 760 | if (peer_item) |
| 761 | hashcpy(rm->peer_ref->old_sha1, |
| 762 | peer_item->util); |
| 763 | } |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 764 | } |
| 765 | |
Shawn O. Pearce | 41fa7d2 | 2008-03-03 22:27:40 -0500 | [diff] [blame] | 766 | if (tags == TAGS_DEFAULT && autotags) |
| 767 | transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1"); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 768 | if (fetch_refs(transport, ref_map)) { |
| 769 | free_refs(ref_map); |
Michael Haggerty | 5b87d8d | 2013-05-25 11:08:16 +0200 | [diff] [blame] | 770 | retcode = 1; |
| 771 | goto cleanup; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 772 | } |
Carlos Martín Nieto | ed43de6 | 2011-10-15 07:04:25 +0200 | [diff] [blame] | 773 | if (prune) { |
Carlos Martín Nieto | e8c1e6c | 2011-10-15 07:04:26 +0200 | [diff] [blame] | 774 | /* If --tags was specified, pretend the user gave us the canonical tags refspec */ |
| 775 | if (tags == TAGS_SET) { |
| 776 | const char *tags_str = "refs/tags/*:refs/tags/*"; |
| 777 | struct refspec *tags_refspec, *refspec; |
| 778 | |
| 779 | /* Copy the refspec and add the tags to it */ |
| 780 | refspec = xcalloc(ref_count + 1, sizeof(struct refspec)); |
| 781 | tags_refspec = parse_fetch_refspec(1, &tags_str); |
| 782 | memcpy(refspec, refs, ref_count * sizeof(struct refspec)); |
| 783 | memcpy(&refspec[ref_count], tags_refspec, sizeof(struct refspec)); |
| 784 | ref_count++; |
| 785 | |
| 786 | prune_refs(refspec, ref_count, ref_map); |
| 787 | |
| 788 | ref_count--; |
| 789 | /* The rest of the strings belong to fetch_one */ |
| 790 | free_refspec(1, tags_refspec); |
| 791 | free(refspec); |
| 792 | } else if (ref_count) { |
Carlos Martín Nieto | ed43de6 | 2011-10-15 07:04:25 +0200 | [diff] [blame] | 793 | prune_refs(refs, ref_count, ref_map); |
Carlos Martín Nieto | e8c1e6c | 2011-10-15 07:04:26 +0200 | [diff] [blame] | 794 | } else { |
Carlos Martín Nieto | ed43de6 | 2011-10-15 07:04:25 +0200 | [diff] [blame] | 795 | prune_refs(transport->remote->fetch, transport->remote->fetch_refspec_nr, ref_map); |
Carlos Martín Nieto | e8c1e6c | 2011-10-15 07:04:26 +0200 | [diff] [blame] | 796 | } |
Carlos Martín Nieto | ed43de6 | 2011-10-15 07:04:25 +0200 | [diff] [blame] | 797 | } |
Shawn O. Pearce | 7f98428 | 2008-03-02 21:34:43 -0500 | [diff] [blame] | 798 | free_refs(ref_map); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 799 | |
| 800 | /* if neither --no-tags nor --tags was specified, do automated tag |
| 801 | * following ... */ |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 802 | if (tags == TAGS_DEFAULT && autotags) { |
Shawn O. Pearce | c50b2b4 | 2008-03-02 21:35:00 -0500 | [diff] [blame] | 803 | struct ref **tail = &ref_map; |
| 804 | ref_map = NULL; |
| 805 | find_non_local_tags(transport, &ref_map, &tail); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 806 | if (ref_map) { |
Shawn O. Pearce | 41fa7d2 | 2008-03-03 22:27:40 -0500 | [diff] [blame] | 807 | transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 808 | transport_set_option(transport, TRANS_OPT_DEPTH, "0"); |
| 809 | fetch_refs(transport, ref_map); |
| 810 | } |
| 811 | free_refs(ref_map); |
| 812 | } |
| 813 | |
Michael Haggerty | 5b87d8d | 2013-05-25 11:08:16 +0200 | [diff] [blame] | 814 | cleanup: |
Michael Haggerty | f83918e | 2013-05-25 11:08:17 +0200 | [diff] [blame] | 815 | string_list_clear(&existing_refs, 1); |
Michael Haggerty | 5b87d8d | 2013-05-25 11:08:16 +0200 | [diff] [blame] | 816 | return retcode; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 817 | } |
| 818 | |
Shawn O. Pearce | ab865e6 | 2007-09-18 04:54:57 -0400 | [diff] [blame] | 819 | static void set_option(const char *name, const char *value) |
| 820 | { |
Junio C Hamano | af23445 | 2013-08-07 15:38:45 -0700 | [diff] [blame^] | 821 | int r = transport_set_option(gtransport, name, value); |
Shawn O. Pearce | ab865e6 | 2007-09-18 04:54:57 -0400 | [diff] [blame] | 822 | if (r < 0) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 823 | die(_("Option \"%s\" value \"%s\" is not valid for %s"), |
Junio C Hamano | af23445 | 2013-08-07 15:38:45 -0700 | [diff] [blame^] | 824 | name, value, gtransport->url); |
Shawn O. Pearce | ab865e6 | 2007-09-18 04:54:57 -0400 | [diff] [blame] | 825 | if (r > 0) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 826 | warning(_("Option \"%s\" is ignored for %s\n"), |
Junio C Hamano | af23445 | 2013-08-07 15:38:45 -0700 | [diff] [blame^] | 827 | name, gtransport->url); |
Shawn O. Pearce | ab865e6 | 2007-09-18 04:54:57 -0400 | [diff] [blame] | 828 | } |
| 829 | |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 830 | static int get_one_remote_for_fetch(struct remote *remote, void *priv) |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 831 | { |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 832 | struct string_list *list = priv; |
Björn Gustavsson | 7cc91a2 | 2009-11-09 21:11:06 +0100 | [diff] [blame] | 833 | if (!remote->skip_default_update) |
Julian Phillips | 1d2f80f | 2010-06-26 00:41:38 +0100 | [diff] [blame] | 834 | string_list_append(list, remote->name); |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 835 | return 0; |
| 836 | } |
| 837 | |
| 838 | struct remote_group_data { |
| 839 | const char *name; |
| 840 | struct string_list *list; |
| 841 | }; |
| 842 | |
| 843 | static int get_remote_group(const char *key, const char *value, void *priv) |
| 844 | { |
| 845 | struct remote_group_data *g = priv; |
| 846 | |
| 847 | if (!prefixcmp(key, "remotes.") && |
| 848 | !strcmp(key + 8, g->name)) { |
| 849 | /* split list by white space */ |
| 850 | int space = strcspn(value, " \t\n"); |
| 851 | while (*value) { |
| 852 | if (space > 1) { |
Julian Phillips | 1d2f80f | 2010-06-26 00:41:38 +0100 | [diff] [blame] | 853 | string_list_append(g->list, |
| 854 | xstrndup(value, space)); |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 855 | } |
| 856 | value += space + (value[space] != '\0'); |
| 857 | space = strcspn(value, " \t\n"); |
| 858 | } |
| 859 | } |
| 860 | |
| 861 | return 0; |
| 862 | } |
| 863 | |
| 864 | static int add_remote_or_group(const char *name, struct string_list *list) |
| 865 | { |
| 866 | int prev_nr = list->nr; |
Gary V. Vaughan | 66dbfd5 | 2010-05-14 09:31:33 +0000 | [diff] [blame] | 867 | struct remote_group_data g; |
| 868 | g.name = name; g.list = list; |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 869 | |
| 870 | git_config(get_remote_group, &g); |
| 871 | if (list->nr == prev_nr) { |
| 872 | struct remote *remote; |
| 873 | if (!remote_is_configured(name)) |
| 874 | return 0; |
| 875 | remote = remote_get(name); |
Julian Phillips | 1d2f80f | 2010-06-26 00:41:38 +0100 | [diff] [blame] | 876 | string_list_append(list, remote->name); |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 877 | } |
| 878 | return 1; |
| 879 | } |
| 880 | |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 881 | static void add_options_to_argv(struct argv_array *argv) |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 882 | { |
| 883 | if (dry_run) |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 884 | argv_array_push(argv, "--dry-run"); |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 885 | if (prune) |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 886 | argv_array_push(argv, "--prune"); |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 887 | if (update_head_ok) |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 888 | argv_array_push(argv, "--update-head-ok"); |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 889 | if (force) |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 890 | argv_array_push(argv, "--force"); |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 891 | if (keep) |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 892 | argv_array_push(argv, "--keep"); |
Jens Lehmann | be254a0 | 2010-11-11 00:55:02 +0100 | [diff] [blame] | 893 | if (recurse_submodules == RECURSE_SUBMODULES_ON) |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 894 | argv_array_push(argv, "--recurse-submodules"); |
Jens Lehmann | 8f0700d | 2011-03-06 23:11:21 +0100 | [diff] [blame] | 895 | else if (recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND) |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 896 | argv_array_push(argv, "--recurse-submodules=on-demand"); |
Dan Johnson | 8556646 | 2012-09-05 17:22:19 -0400 | [diff] [blame] | 897 | if (tags == TAGS_SET) |
| 898 | argv_array_push(argv, "--tags"); |
| 899 | else if (tags == TAGS_UNSET) |
| 900 | argv_array_push(argv, "--no-tags"); |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 901 | if (verbosity >= 2) |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 902 | argv_array_push(argv, "-v"); |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 903 | if (verbosity >= 1) |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 904 | argv_array_push(argv, "-v"); |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 905 | else if (verbosity < 0) |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 906 | argv_array_push(argv, "-q"); |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 907 | |
| 908 | } |
| 909 | |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 910 | static int fetch_multiple(struct string_list *list) |
| 911 | { |
| 912 | int i, result = 0; |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 913 | struct argv_array argv = ARGV_ARRAY_INIT; |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 914 | |
Junio C Hamano | e6cc510 | 2010-02-24 11:02:05 -0800 | [diff] [blame] | 915 | if (!append && !dry_run) { |
| 916 | int errcode = truncate_fetch_head(); |
| 917 | if (errcode) |
| 918 | return errcode; |
| 919 | } |
| 920 | |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 921 | argv_array_pushl(&argv, "fetch", "--append", NULL); |
| 922 | add_options_to_argv(&argv); |
| 923 | |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 924 | for (i = 0; i < list->nr; i++) { |
| 925 | const char *name = list->items[i].string; |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 926 | argv_array_push(&argv, name); |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 927 | if (verbosity >= 0) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 928 | printf(_("Fetching %s\n"), name); |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 929 | if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) { |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 930 | error(_("Could not fetch %s"), name); |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 931 | result = 1; |
| 932 | } |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 933 | argv_array_pop(&argv); |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 934 | } |
| 935 | |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 936 | argv_array_clear(&argv); |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 937 | return result; |
| 938 | } |
| 939 | |
| 940 | static int fetch_one(struct remote *remote, int argc, const char **argv) |
| 941 | { |
Kristian Høgsberg | 2d324ef | 2007-12-04 02:25:46 -0500 | [diff] [blame] | 942 | int i; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 943 | static const char **refs = NULL; |
Jim Meyering | d8ead15 | 2011-06-08 22:06:33 +0200 | [diff] [blame] | 944 | struct refspec *refspec; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 945 | int ref_nr = 0; |
Alex Riesen | 7b7f39e | 2008-04-28 22:23:35 +0200 | [diff] [blame] | 946 | int exit_code; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 947 | |
Daniel Barkalow | fa685bd | 2009-03-11 01:47:20 -0400 | [diff] [blame] | 948 | if (!remote) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 949 | die(_("No remote repository specified. Please, specify either a URL or a\n" |
| 950 | "remote name from which new revisions should be fetched.")); |
Daniel Barkalow | fa685bd | 2009-03-11 01:47:20 -0400 | [diff] [blame] | 951 | |
Junio C Hamano | af23445 | 2013-08-07 15:38:45 -0700 | [diff] [blame^] | 952 | gtransport = transport_get(remote, NULL); |
| 953 | transport_set_verbosity(gtransport, verbosity, progress); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 954 | if (upload_pack) |
Shawn O. Pearce | ab865e6 | 2007-09-18 04:54:57 -0400 | [diff] [blame] | 955 | set_option(TRANS_OPT_UPLOADPACK, upload_pack); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 956 | if (keep) |
Shawn O. Pearce | ab865e6 | 2007-09-18 04:54:57 -0400 | [diff] [blame] | 957 | set_option(TRANS_OPT_KEEP, "yes"); |
| 958 | if (depth) |
| 959 | set_option(TRANS_OPT_DEPTH, depth); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 960 | |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 961 | if (argc > 0) { |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 962 | int j = 0; |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 963 | refs = xcalloc(argc + 1, sizeof(const char *)); |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 964 | for (i = 0; i < argc; i++) { |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 965 | if (!strcmp(argv[i], "tag")) { |
| 966 | char *ref; |
| 967 | i++; |
Kevin Ballard | f53423b | 2008-04-05 14:28:53 -0400 | [diff] [blame] | 968 | if (i >= argc) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 969 | die(_("You need to specify a tag name.")); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 970 | ref = xmalloc(strlen(argv[i]) * 2 + 22); |
| 971 | strcpy(ref, "refs/tags/"); |
| 972 | strcat(ref, argv[i]); |
| 973 | strcat(ref, ":refs/tags/"); |
| 974 | strcat(ref, argv[i]); |
| 975 | refs[j++] = ref; |
| 976 | } else |
| 977 | refs[j++] = argv[i]; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 978 | } |
| 979 | refs[j] = NULL; |
| 980 | ref_nr = j; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 981 | } |
| 982 | |
Jeff King | 57b235a | 2009-01-22 01:03:08 -0500 | [diff] [blame] | 983 | sigchain_push_common(unlock_pack_on_signal); |
Shawn O. Pearce | e4022ed | 2007-09-14 03:31:25 -0400 | [diff] [blame] | 984 | atexit(unlock_pack); |
Jim Meyering | d8ead15 | 2011-06-08 22:06:33 +0200 | [diff] [blame] | 985 | refspec = parse_fetch_refspec(ref_nr, refs); |
Junio C Hamano | af23445 | 2013-08-07 15:38:45 -0700 | [diff] [blame^] | 986 | exit_code = do_fetch(gtransport, refspec, ref_nr); |
Carlos Martín Nieto | 5caf197 | 2011-10-08 00:51:06 +0200 | [diff] [blame] | 987 | free_refspec(ref_nr, refspec); |
Junio C Hamano | af23445 | 2013-08-07 15:38:45 -0700 | [diff] [blame^] | 988 | transport_disconnect(gtransport); |
| 989 | gtransport = NULL; |
Alex Riesen | 7b7f39e | 2008-04-28 22:23:35 +0200 | [diff] [blame] | 990 | return exit_code; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 991 | } |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 992 | |
| 993 | int cmd_fetch(int argc, const char **argv, const char *prefix) |
| 994 | { |
| 995 | int i; |
Thiago Farina | 183113a | 2010-07-04 16:46:19 -0300 | [diff] [blame] | 996 | struct string_list list = STRING_LIST_INIT_NODUP; |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 997 | struct remote *remote; |
| 998 | int result = 0; |
Jeff King | 131b8fc | 2013-01-26 17:40:38 -0500 | [diff] [blame] | 999 | static const char *argv_gc_auto[] = { |
| 1000 | "gc", "--auto", NULL, |
| 1001 | }; |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1002 | |
Jeff King | bbc30f9 | 2011-02-24 09:30:19 -0500 | [diff] [blame] | 1003 | packet_trace_identity("fetch"); |
| 1004 | |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1005 | /* Record the command line for the reflog */ |
| 1006 | strbuf_addstr(&default_rla, "fetch"); |
| 1007 | for (i = 1; i < argc; i++) |
| 1008 | strbuf_addf(&default_rla, " %s", argv[i]); |
| 1009 | |
| 1010 | argc = parse_options(argc, argv, prefix, |
| 1011 | builtin_fetch_options, builtin_fetch_usage, 0); |
| 1012 | |
Nguyễn Thái Ngọc Duy | 4dcb167 | 2013-01-11 16:05:46 +0700 | [diff] [blame] | 1013 | if (unshallow) { |
| 1014 | if (depth) |
| 1015 | die(_("--depth and --unshallow cannot be used together")); |
| 1016 | else if (!is_repository_shallow()) |
| 1017 | die(_("--unshallow on a complete repository does not make sense")); |
| 1018 | else { |
| 1019 | static char inf_depth[12]; |
| 1020 | sprintf(inf_depth, "%d", INFINITE_DEPTH); |
| 1021 | depth = inf_depth; |
| 1022 | } |
| 1023 | } |
| 1024 | |
Jens Lehmann | 18322ba | 2011-09-09 20:22:03 +0200 | [diff] [blame] | 1025 | if (recurse_submodules != RECURSE_SUBMODULES_OFF) { |
| 1026 | if (recurse_submodules_default) { |
| 1027 | int arg = parse_fetch_recurse_submodules_arg("--recurse-submodules-default", recurse_submodules_default); |
| 1028 | set_config_fetch_recurse_submodules(arg); |
| 1029 | } |
| 1030 | gitmodules_config(); |
| 1031 | git_config(submodule_config, NULL); |
| 1032 | } |
| 1033 | |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1034 | if (all) { |
| 1035 | if (argc == 1) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 1036 | die(_("fetch --all does not take a repository argument")); |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1037 | else if (argc > 1) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 1038 | die(_("fetch --all does not make sense with refspecs")); |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1039 | (void) for_each_remote(get_one_remote_for_fetch, &list); |
| 1040 | result = fetch_multiple(&list); |
| 1041 | } else if (argc == 0) { |
| 1042 | /* No arguments -- use default remote */ |
| 1043 | remote = remote_get(NULL); |
| 1044 | result = fetch_one(remote, argc, argv); |
Björn Gustavsson | 16679e3 | 2009-11-09 21:10:32 +0100 | [diff] [blame] | 1045 | } else if (multiple) { |
| 1046 | /* All arguments are assumed to be remotes or groups */ |
| 1047 | for (i = 0; i < argc; i++) |
| 1048 | if (!add_remote_or_group(argv[i], &list)) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 1049 | die(_("No such remote or remote group: %s"), argv[i]); |
Björn Gustavsson | 16679e3 | 2009-11-09 21:10:32 +0100 | [diff] [blame] | 1050 | result = fetch_multiple(&list); |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1051 | } else { |
| 1052 | /* Single remote or group */ |
| 1053 | (void) add_remote_or_group(argv[0], &list); |
| 1054 | if (list.nr > 1) { |
| 1055 | /* More than one remote */ |
| 1056 | if (argc > 1) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 1057 | die(_("Fetching a group and specifying refspecs does not make sense")); |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1058 | result = fetch_multiple(&list); |
| 1059 | } else { |
| 1060 | /* Zero or one remotes */ |
| 1061 | remote = remote_get(argv[0]); |
| 1062 | result = fetch_one(remote, argc-1, argv+1); |
| 1063 | } |
| 1064 | } |
| 1065 | |
Jens Lehmann | be254a0 | 2010-11-11 00:55:02 +0100 | [diff] [blame] | 1066 | if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) { |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 1067 | struct argv_array options = ARGV_ARRAY_INIT; |
| 1068 | |
| 1069 | add_options_to_argv(&options); |
Jens Lehmann | 50d89ad | 2012-09-01 17:27:06 +0200 | [diff] [blame] | 1070 | result = fetch_populated_submodules(&options, |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 1071 | submodule_prefix, |
Jens Lehmann | 8f0700d | 2011-03-06 23:11:21 +0100 | [diff] [blame] | 1072 | recurse_submodules, |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 1073 | verbosity < 0); |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 1074 | argv_array_clear(&options); |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 1075 | } |
| 1076 | |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1077 | /* All names were strdup()ed or strndup()ed */ |
| 1078 | list.strdup_strings = 1; |
| 1079 | string_list_clear(&list, 0); |
| 1080 | |
Jeff King | 131b8fc | 2013-01-26 17:40:38 -0500 | [diff] [blame] | 1081 | run_command_v_opt(argv_gc_auto, RUN_GIT_CMD); |
| 1082 | |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1083 | return result; |
| 1084 | } |