Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 1 | /* |
| 2 | * "git fetch" |
| 3 | */ |
| 4 | #include "cache.h" |
Brandon Williams | b2141fc | 2017-06-14 11:07:36 -0700 | [diff] [blame] | 5 | #include "config.h" |
Brandon Williams | e724197 | 2017-12-12 11:53:52 -0800 | [diff] [blame] | 6 | #include "repository.h" |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 7 | #include "refs.h" |
Brandon Williams | ec0cb49 | 2018-05-16 15:57:48 -0700 | [diff] [blame] | 8 | #include "refspec.h" |
Stefan Beller | cbd53a2 | 2018-05-15 16:42:15 -0700 | [diff] [blame] | 9 | #include "object-store.h" |
Masaya Suzuki | b7e2d8b | 2019-09-15 14:18:02 -0700 | [diff] [blame] | 10 | #include "oidset.h" |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 11 | #include "commit.h" |
| 12 | #include "builtin.h" |
Johannes Schindelin | c455c87 | 2008-07-21 19:03:49 +0100 | [diff] [blame] | 13 | #include "string-list.h" |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 14 | #include "remote.h" |
| 15 | #include "transport.h" |
Shawn O. Pearce | 4191c35 | 2007-11-11 02:29:47 -0500 | [diff] [blame] | 16 | #include "run-command.h" |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 17 | #include "parse-options.h" |
Jeff King | 4a16d07 | 2009-01-22 01:02:35 -0500 | [diff] [blame] | 18 | #include "sigchain.h" |
Heiko Voigt | 027771f | 2015-08-17 17:22:00 -0700 | [diff] [blame] | 19 | #include "submodule-config.h" |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 20 | #include "submodule.h" |
Junio C Hamano | f96400c | 2011-09-02 16:33:22 -0700 | [diff] [blame] | 21 | #include "connected.h" |
Jeff King | dbbcd44 | 2020-07-28 16:23:39 -0400 | [diff] [blame] | 22 | #include "strvec.h" |
Nguyễn Thái Ngọc Duy | 6bc91f2 | 2016-07-01 18:03:30 +0200 | [diff] [blame] | 23 | #include "utf8.h" |
Jonathan Tan | 3836d88 | 2017-08-18 15:20:21 -0700 | [diff] [blame] | 24 | #include "packfile.h" |
Jeff Hostetler | acb0c57 | 2017-12-08 15:58:44 +0000 | [diff] [blame] | 25 | #include "list-objects-filter-options.h" |
Derrick Stolee | 6404355 | 2018-07-20 16:33:04 +0000 | [diff] [blame] | 26 | #include "commit-reach.h" |
Corentin BOMPARD | 24bc1a1 | 2019-08-19 11:11:20 +0200 | [diff] [blame] | 27 | #include "branch.h" |
Christian Couder | b14ed5a | 2019-06-25 15:40:31 +0200 | [diff] [blame] | 28 | #include "promisor-remote.h" |
Derrick Stolee | 50f26bd | 2019-09-02 19:22:02 -0700 | [diff] [blame] | 29 | #include "commit-graph.h" |
Taylor Blau | 120ad2b | 2020-04-30 13:48:50 -0600 | [diff] [blame] | 30 | #include "shallow.h" |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 31 | |
Derrick Stolee | 377444b | 2019-06-18 13:25:27 -0700 | [diff] [blame] | 32 | #define FORCED_UPDATES_DELAY_WARNING_IN_MS (10 * 1000) |
| 33 | |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 34 | static const char * const builtin_fetch_usage[] = { |
Nguyễn Thái Ngọc Duy | 719aced | 2012-08-20 19:32:09 +0700 | [diff] [blame] | 35 | N_("git fetch [<options>] [<repository> [<refspec>...]]"), |
| 36 | N_("git fetch [<options>] <group>"), |
| 37 | N_("git fetch --multiple [<options>] [(<repository> | <group>)...]"), |
| 38 | N_("git fetch --all [<options>]"), |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 39 | NULL |
| 40 | }; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 41 | |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 42 | enum { |
| 43 | TAGS_UNSET = 0, |
| 44 | TAGS_DEFAULT = 1, |
| 45 | TAGS_SET = 2 |
| 46 | }; |
| 47 | |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 48 | static int fetch_prune_config = -1; /* unspecified */ |
Derrick Stolee | cdbd70c | 2019-06-18 13:25:26 -0700 | [diff] [blame] | 49 | static int fetch_show_forced_updates = 1; |
Derrick Stolee | 377444b | 2019-06-18 13:25:27 -0700 | [diff] [blame] | 50 | static uint64_t forced_updates_ms = 0; |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 51 | static int prune = -1; /* unspecified */ |
| 52 | #define PRUNE_BY_DEFAULT 0 /* do we prune by default? */ |
| 53 | |
Ævar Arnfjörð Bjarmason | 97716d2 | 2018-02-09 20:32:15 +0000 | [diff] [blame] | 54 | static int fetch_prune_tags_config = -1; /* unspecified */ |
| 55 | static int prune_tags = -1; /* unspecified */ |
| 56 | #define PRUNE_TAGS_BY_DEFAULT 0 /* do we prune tags by default? */ |
| 57 | |
Corentin BOMPARD | 24bc1a1 | 2019-08-19 11:11:20 +0200 | [diff] [blame] | 58 | static int all, append, dry_run, force, keep, multiple, update_head_ok; |
Junio C Hamano | 887952b | 2020-08-18 14:25:22 +0000 | [diff] [blame] | 59 | static int write_fetch_head = 1; |
Corentin BOMPARD | 24bc1a1 | 2019-08-19 11:11:20 +0200 | [diff] [blame] | 60 | static int verbosity, deepen_relative, set_upstream; |
Stefan Beller | 8c69832 | 2017-06-23 12:13:01 -0700 | [diff] [blame] | 61 | static int progress = -1; |
Nguyễn Thái Ngọc Duy | c3d6b70 | 2019-06-19 16:46:30 +0700 | [diff] [blame] | 62 | static int enable_auto_gc = 1; |
Nguyễn Thái Ngọc Duy | 508ea88 | 2016-06-12 17:53:59 +0700 | [diff] [blame] | 63 | static int tags = TAGS_DEFAULT, unshallow, update_shallow, deepen; |
Johannes Schindelin | d54dea7 | 2019-10-05 11:46:40 -0700 | [diff] [blame] | 64 | static int max_jobs = -1, submodule_fetch_jobs_config = -1; |
| 65 | static int fetch_parallel_config = 1; |
Eric Wong | c915f11 | 2016-02-03 04:09:14 +0000 | [diff] [blame] | 66 | static enum transport_family family; |
Shawn O. Pearce | 4191c35 | 2007-11-11 02:29:47 -0500 | [diff] [blame] | 67 | static const char *depth; |
Nguyễn Thái Ngọc Duy | 508ea88 | 2016-06-12 17:53:59 +0700 | [diff] [blame] | 68 | static const char *deepen_since; |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 69 | static const char *upload_pack; |
Nguyễn Thái Ngọc Duy | a45a260 | 2016-06-12 17:54:04 +0700 | [diff] [blame] | 70 | static struct string_list deepen_not = STRING_LIST_INIT_NODUP; |
Kristian Høgsberg | 2d324ef | 2007-12-04 02:25:46 -0500 | [diff] [blame] | 71 | static struct strbuf default_rla = STRBUF_INIT; |
Junio C Hamano | af23445 | 2013-08-07 15:38:45 -0700 | [diff] [blame] | 72 | static struct transport *gtransport; |
Junio C Hamano | b26ed43 | 2013-08-07 15:47:18 -0700 | [diff] [blame] | 73 | static struct transport *gsecondary; |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 74 | static const char *submodule_prefix = ""; |
Stefan Beller | 8c69832 | 2017-06-23 12:13:01 -0700 | [diff] [blame] | 75 | static int recurse_submodules = RECURSE_SUBMODULES_DEFAULT; |
Stefan Beller | e8906a9 | 2017-06-27 14:31:59 -0700 | [diff] [blame] | 76 | static int recurse_submodules_default = RECURSE_SUBMODULES_ON_DEMAND; |
Tom Miller | 4b3b33a | 2014-01-02 20:28:51 -0600 | [diff] [blame] | 77 | static int shown_url = 0; |
Brandon Williams | e4cffac | 2018-05-16 15:58:05 -0700 | [diff] [blame] | 78 | static struct refspec refmap = REFSPEC_INIT_FETCH; |
Jeff Hostetler | acb0c57 | 2017-12-08 15:58:44 +0000 | [diff] [blame] | 79 | static struct list_objects_filter_options filter_options; |
Brandon Williams | 5e3548e | 2018-04-23 15:46:24 -0700 | [diff] [blame] | 80 | static struct string_list server_options = STRING_LIST_INIT_DUP; |
Jonathan Tan | 3390e42 | 2018-07-02 15:39:44 -0700 | [diff] [blame] | 81 | static struct string_list negotiation_tip = STRING_LIST_INIT_NODUP; |
Johannes Schindelin | c14e6e7 | 2019-11-03 00:21:56 +0000 | [diff] [blame] | 82 | static int fetch_write_commit_graph = -1; |
Shawn O. Pearce | e4022ed | 2007-09-14 03:31:25 -0400 | [diff] [blame] | 83 | |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 84 | static int git_fetch_config(const char *k, const char *v, void *cb) |
| 85 | { |
| 86 | if (!strcmp(k, "fetch.prune")) { |
| 87 | fetch_prune_config = git_config_bool(k, v); |
| 88 | return 0; |
| 89 | } |
Stefan Beller | 58f4203 | 2017-05-31 17:30:50 -0700 | [diff] [blame] | 90 | |
Ævar Arnfjörð Bjarmason | 97716d2 | 2018-02-09 20:32:15 +0000 | [diff] [blame] | 91 | if (!strcmp(k, "fetch.prunetags")) { |
| 92 | fetch_prune_tags_config = git_config_bool(k, v); |
| 93 | return 0; |
| 94 | } |
| 95 | |
Derrick Stolee | cdbd70c | 2019-06-18 13:25:26 -0700 | [diff] [blame] | 96 | if (!strcmp(k, "fetch.showforcedupdates")) { |
| 97 | fetch_show_forced_updates = git_config_bool(k, v); |
| 98 | return 0; |
| 99 | } |
| 100 | |
Stefan Beller | 58f4203 | 2017-05-31 17:30:50 -0700 | [diff] [blame] | 101 | if (!strcmp(k, "submodule.recurse")) { |
| 102 | int r = git_config_bool(k, v) ? |
| 103 | RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF; |
| 104 | recurse_submodules = r; |
| 105 | } |
| 106 | |
Brandon Williams | f20e7c1 | 2017-08-02 12:49:18 -0700 | [diff] [blame] | 107 | if (!strcmp(k, "submodule.fetchjobs")) { |
Johannes Schindelin | d54dea7 | 2019-10-05 11:46:40 -0700 | [diff] [blame] | 108 | submodule_fetch_jobs_config = parse_submodule_fetchjobs(k, v); |
Brandon Williams | f20e7c1 | 2017-08-02 12:49:18 -0700 | [diff] [blame] | 109 | return 0; |
Brandon Williams | 8fa2915 | 2017-08-02 12:49:19 -0700 | [diff] [blame] | 110 | } else if (!strcmp(k, "fetch.recursesubmodules")) { |
| 111 | recurse_submodules = parse_fetch_recurse_submodules_arg(k, v); |
| 112 | return 0; |
Brandon Williams | f20e7c1 | 2017-08-02 12:49:18 -0700 | [diff] [blame] | 113 | } |
| 114 | |
Johannes Schindelin | d54dea7 | 2019-10-05 11:46:40 -0700 | [diff] [blame] | 115 | if (!strcmp(k, "fetch.parallel")) { |
| 116 | fetch_parallel_config = git_config_int(k, v); |
| 117 | if (fetch_parallel_config < 0) |
| 118 | die(_("fetch.parallel cannot be negative")); |
| 119 | return 0; |
| 120 | } |
| 121 | |
Jeff King | 72549df | 2014-11-04 08:11:19 -0500 | [diff] [blame] | 122 | return git_default_config(k, v, cb); |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 123 | } |
| 124 | |
Junio C Hamano | c5558f8 | 2014-05-29 15:21:31 -0700 | [diff] [blame] | 125 | static int parse_refmap_arg(const struct option *opt, const char *arg, int unset) |
| 126 | { |
Jeff King | 517fe80 | 2018-11-05 01:45:42 -0500 | [diff] [blame] | 127 | BUG_ON_OPT_NEG(unset); |
| 128 | |
Junio C Hamano | c5558f8 | 2014-05-29 15:21:31 -0700 | [diff] [blame] | 129 | /* |
| 130 | * "git fetch --refmap='' origin foo" |
| 131 | * can be used to tell the command not to store anywhere |
| 132 | */ |
Brandon Williams | e4cffac | 2018-05-16 15:58:05 -0700 | [diff] [blame] | 133 | refspec_append(&refmap, arg); |
| 134 | |
Junio C Hamano | c5558f8 | 2014-05-29 15:21:31 -0700 | [diff] [blame] | 135 | return 0; |
| 136 | } |
| 137 | |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 138 | static struct option builtin_fetch_options[] = { |
Tuncer Ayaz | 7f87aff | 2008-11-15 01:14:24 +0100 | [diff] [blame] | 139 | OPT__VERBOSITY(&verbosity), |
Stefan Beller | d5d09d4 | 2013-08-03 13:51:19 +0200 | [diff] [blame] | 140 | OPT_BOOL(0, "all", &all, |
| 141 | N_("fetch from all remotes")), |
Corentin BOMPARD | 24bc1a1 | 2019-08-19 11:11:20 +0200 | [diff] [blame] | 142 | OPT_BOOL(0, "set-upstream", &set_upstream, |
| 143 | N_("set upstream for git pull/fetch")), |
Stefan Beller | d5d09d4 | 2013-08-03 13:51:19 +0200 | [diff] [blame] | 144 | OPT_BOOL('a', "append", &append, |
| 145 | N_("append to .git/FETCH_HEAD instead of overwriting")), |
Nguyễn Thái Ngọc Duy | 719aced | 2012-08-20 19:32:09 +0700 | [diff] [blame] | 146 | OPT_STRING(0, "upload-pack", &upload_pack, N_("path"), |
| 147 | N_("path to upload pack on remote end")), |
Ævar Arnfjörð Bjarmason | 8cd4b7c | 2018-08-31 20:09:56 +0000 | [diff] [blame] | 148 | OPT__FORCE(&force, N_("force overwrite of local reference"), 0), |
Stefan Beller | d5d09d4 | 2013-08-03 13:51:19 +0200 | [diff] [blame] | 149 | OPT_BOOL('m', "multiple", &multiple, |
| 150 | N_("fetch from multiple remotes")), |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 151 | OPT_SET_INT('t', "tags", &tags, |
Nguyễn Thái Ngọc Duy | 719aced | 2012-08-20 19:32:09 +0700 | [diff] [blame] | 152 | N_("fetch all tags and associated objects"), TAGS_SET), |
Johannes Schindelin | e795129 | 2008-03-13 08:13:15 +0100 | [diff] [blame] | 153 | OPT_SET_INT('n', NULL, &tags, |
Nguyễn Thái Ngọc Duy | 719aced | 2012-08-20 19:32:09 +0700 | [diff] [blame] | 154 | N_("do not fetch all tags (--no-tags)"), TAGS_UNSET), |
Johannes Schindelin | d54dea7 | 2019-10-05 11:46:40 -0700 | [diff] [blame] | 155 | OPT_INTEGER('j', "jobs", &max_jobs, |
Stefan Beller | 62104ba | 2015-12-15 16:04:12 -0800 | [diff] [blame] | 156 | N_("number of submodules fetched in parallel")), |
Stefan Beller | d5d09d4 | 2013-08-03 13:51:19 +0200 | [diff] [blame] | 157 | OPT_BOOL('p', "prune", &prune, |
| 158 | N_("prune remote-tracking branches no longer on remote")), |
Ævar Arnfjörð Bjarmason | 97716d2 | 2018-02-09 20:32:15 +0000 | [diff] [blame] | 159 | OPT_BOOL('P', "prune-tags", &prune_tags, |
| 160 | N_("prune local tags no longer on remote and clobber changed tags")), |
Denton Liu | 203c853 | 2020-04-28 04:36:28 -0400 | [diff] [blame] | 161 | OPT_CALLBACK_F(0, "recurse-submodules", &recurse_submodules, N_("on-demand"), |
Nguyễn Thái Ngọc Duy | 719aced | 2012-08-20 19:32:09 +0700 | [diff] [blame] | 162 | N_("control recursive fetching of submodules"), |
Denton Liu | 203c853 | 2020-04-28 04:36:28 -0400 | [diff] [blame] | 163 | PARSE_OPT_OPTARG, option_fetch_parse_recurse_submodules), |
Stefan Beller | d5d09d4 | 2013-08-03 13:51:19 +0200 | [diff] [blame] | 164 | OPT_BOOL(0, "dry-run", &dry_run, |
| 165 | N_("dry run")), |
Junio C Hamano | 887952b | 2020-08-18 14:25:22 +0000 | [diff] [blame] | 166 | OPT_BOOL(0, "write-fetch-head", &write_fetch_head, |
| 167 | N_("write fetched references to the FETCH_HEAD file")), |
Stefan Beller | d5d09d4 | 2013-08-03 13:51:19 +0200 | [diff] [blame] | 168 | OPT_BOOL('k', "keep", &keep, N_("keep downloaded pack")), |
| 169 | OPT_BOOL('u', "update-head-ok", &update_head_ok, |
Nguyễn Thái Ngọc Duy | 719aced | 2012-08-20 19:32:09 +0700 | [diff] [blame] | 170 | N_("allow updating of HEAD ref")), |
| 171 | OPT_BOOL(0, "progress", &progress, N_("force progress reporting")), |
| 172 | OPT_STRING(0, "depth", &depth, N_("depth"), |
| 173 | N_("deepen history of shallow clone")), |
Nguyễn Thái Ngọc Duy | 508ea88 | 2016-06-12 17:53:59 +0700 | [diff] [blame] | 174 | OPT_STRING(0, "shallow-since", &deepen_since, N_("time"), |
| 175 | N_("deepen history of shallow repository based on time")), |
Nguyễn Thái Ngọc Duy | a45a260 | 2016-06-12 17:54:04 +0700 | [diff] [blame] | 176 | OPT_STRING_LIST(0, "shallow-exclude", &deepen_not, N_("revision"), |
Alex Henrie | 6d87386 | 2016-12-04 15:03:59 -0700 | [diff] [blame] | 177 | N_("deepen history of shallow clone, excluding rev")), |
Nguyễn Thái Ngọc Duy | cccf74e | 2016-06-12 17:54:09 +0700 | [diff] [blame] | 178 | OPT_INTEGER(0, "deepen", &deepen_relative, |
| 179 | N_("deepen history of shallow clone")), |
Nguyễn Thái Ngọc Duy | 3e4a67b | 2018-05-20 17:42:58 +0200 | [diff] [blame] | 180 | OPT_SET_INT_F(0, "unshallow", &unshallow, |
| 181 | N_("convert to a complete repository"), |
| 182 | 1, PARSE_OPT_NONEG), |
Nguyễn Thái Ngọc Duy | 719aced | 2012-08-20 19:32:09 +0700 | [diff] [blame] | 183 | { OPTION_STRING, 0, "submodule-prefix", &submodule_prefix, N_("dir"), |
| 184 | N_("prepend this to submodule path output"), PARSE_OPT_HIDDEN }, |
Denton Liu | 203c853 | 2020-04-28 04:36:28 -0400 | [diff] [blame] | 185 | OPT_CALLBACK_F(0, "recurse-submodules-default", |
Stefan Beller | 8c69832 | 2017-06-23 12:13:01 -0700 | [diff] [blame] | 186 | &recurse_submodules_default, N_("on-demand"), |
| 187 | N_("default for recursive fetching of submodules " |
| 188 | "(lower priority than config files)"), |
Denton Liu | 203c853 | 2020-04-28 04:36:28 -0400 | [diff] [blame] | 189 | PARSE_OPT_HIDDEN, option_fetch_parse_recurse_submodules), |
Nguyễn Thái Ngọc Duy | 48d25ca | 2013-12-05 20:02:42 +0700 | [diff] [blame] | 190 | OPT_BOOL(0, "update-shallow", &update_shallow, |
| 191 | N_("accept refs that update .git/shallow")), |
Denton Liu | 203c853 | 2020-04-28 04:36:28 -0400 | [diff] [blame] | 192 | OPT_CALLBACK_F(0, "refmap", NULL, N_("refmap"), |
| 193 | N_("specify fetch refmap"), PARSE_OPT_NONEG, parse_refmap_arg), |
Brandon Williams | 5e3548e | 2018-04-23 15:46:24 -0700 | [diff] [blame] | 194 | OPT_STRING_LIST('o', "server-option", &server_options, N_("server-specific"), N_("option to transmit")), |
Eric Wong | c915f11 | 2016-02-03 04:09:14 +0000 | [diff] [blame] | 195 | OPT_SET_INT('4', "ipv4", &family, N_("use IPv4 addresses only"), |
| 196 | TRANSPORT_FAMILY_IPV4), |
| 197 | OPT_SET_INT('6', "ipv6", &family, N_("use IPv6 addresses only"), |
| 198 | TRANSPORT_FAMILY_IPV6), |
Jonathan Tan | 3390e42 | 2018-07-02 15:39:44 -0700 | [diff] [blame] | 199 | OPT_STRING_LIST(0, "negotiation-tip", &negotiation_tip, N_("revision"), |
| 200 | N_("report that we have only objects reachable from this object")), |
Jeff Hostetler | acb0c57 | 2017-12-08 15:58:44 +0000 | [diff] [blame] | 201 | OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options), |
Nguyễn Thái Ngọc Duy | c3d6b70 | 2019-06-19 16:46:30 +0700 | [diff] [blame] | 202 | OPT_BOOL(0, "auto-gc", &enable_auto_gc, |
| 203 | N_("run 'gc --auto' after fetching")), |
Derrick Stolee | cdbd70c | 2019-06-18 13:25:26 -0700 | [diff] [blame] | 204 | OPT_BOOL(0, "show-forced-updates", &fetch_show_forced_updates, |
| 205 | N_("check for forced-updates on all updated branches")), |
Johannes Schindelin | c14e6e7 | 2019-11-03 00:21:56 +0000 | [diff] [blame] | 206 | OPT_BOOL(0, "write-commit-graph", &fetch_write_commit_graph, |
| 207 | N_("write the commit-graph after fetching")), |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 208 | OPT_END() |
| 209 | }; |
| 210 | |
Shawn O. Pearce | e4022ed | 2007-09-14 03:31:25 -0400 | [diff] [blame] | 211 | static void unlock_pack(void) |
| 212 | { |
Junio C Hamano | af23445 | 2013-08-07 15:38:45 -0700 | [diff] [blame] | 213 | if (gtransport) |
| 214 | transport_unlock_pack(gtransport); |
Junio C Hamano | b26ed43 | 2013-08-07 15:47:18 -0700 | [diff] [blame] | 215 | if (gsecondary) |
| 216 | transport_unlock_pack(gsecondary); |
Shawn O. Pearce | e4022ed | 2007-09-14 03:31:25 -0400 | [diff] [blame] | 217 | } |
| 218 | |
| 219 | static void unlock_pack_on_signal(int signo) |
| 220 | { |
| 221 | unlock_pack(); |
Jeff King | 4a16d07 | 2009-01-22 01:02:35 -0500 | [diff] [blame] | 222 | sigchain_pop(signo); |
Shawn O. Pearce | e4022ed | 2007-09-14 03:31:25 -0400 | [diff] [blame] | 223 | raise(signo); |
| 224 | } |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 225 | |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 226 | static void add_merge_config(struct ref **head, |
Daniel Barkalow | 4577370 | 2007-10-29 21:05:40 -0400 | [diff] [blame] | 227 | const struct ref *remote_refs, |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 228 | struct branch *branch, |
| 229 | struct ref ***tail) |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 230 | { |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 231 | int i; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 232 | |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 233 | for (i = 0; i < branch->merge_nr; i++) { |
| 234 | struct ref *rm, **old_tail = *tail; |
Brandon Williams | 0ad4a5f | 2018-05-16 15:57:49 -0700 | [diff] [blame] | 235 | struct refspec_item refspec; |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 236 | |
| 237 | for (rm = *head; rm; rm = rm->next) { |
| 238 | if (branch_merge_matches(branch, i, rm->name)) { |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 239 | rm->fetch_head_status = FETCH_HEAD_MERGE; |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 240 | break; |
| 241 | } |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 242 | } |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 243 | if (rm) |
| 244 | continue; |
| 245 | |
Junio C Hamano | 9ad7c5a | 2007-10-26 23:09:48 -0700 | [diff] [blame] | 246 | /* |
Matthieu Moy | 8b3f3f8 | 2010-11-02 16:31:23 +0100 | [diff] [blame] | 247 | * Not fetched to a remote-tracking branch? We need to fetch |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 248 | * it anyway to allow this branch's "branch.$name.merge" |
Heikki Orsila | 05207a2 | 2008-09-09 13:28:30 +0300 | [diff] [blame] | 249 | * 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] | 250 | * fail if branch.$name.merge is misconfigured to point |
| 251 | * at a nonexisting branch. If we were indeed called by |
Heikki Orsila | 05207a2 | 2008-09-09 13:28:30 +0300 | [diff] [blame] | 252 | * 'git pull', it will notice the misconfiguration because |
Junio C Hamano | 9ad7c5a | 2007-10-26 23:09:48 -0700 | [diff] [blame] | 253 | * there is no entry in the resulting FETCH_HEAD marked |
| 254 | * for merging. |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 255 | */ |
Andreas Gruenbacher | 8da61a2 | 2010-03-12 23:27:33 +0100 | [diff] [blame] | 256 | memset(&refspec, 0, sizeof(refspec)); |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 257 | refspec.src = branch->merge[i]->src; |
Junio C Hamano | 9ad7c5a | 2007-10-26 23:09:48 -0700 | [diff] [blame] | 258 | get_fetch_map(remote_refs, &refspec, tail, 1); |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 259 | for (rm = *old_tail; rm; rm = rm->next) |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 260 | rm->fetch_head_status = FETCH_HEAD_MERGE; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 261 | } |
| 262 | } |
| 263 | |
Masaya Suzuki | b7e2d8b | 2019-09-15 14:18:02 -0700 | [diff] [blame] | 264 | static void create_fetch_oidset(struct ref **head, struct oidset *out) |
Michael Haggerty | a0fbb5a | 2013-10-30 06:32:55 +0100 | [diff] [blame] | 265 | { |
| 266 | struct ref *rm = *head; |
| 267 | while (rm) { |
Masaya Suzuki | b7e2d8b | 2019-09-15 14:18:02 -0700 | [diff] [blame] | 268 | oidset_insert(out, &rm->old_oid); |
Michael Haggerty | a0fbb5a | 2013-10-30 06:32:55 +0100 | [diff] [blame] | 269 | rm = rm->next; |
| 270 | } |
Michael Haggerty | a0fbb5a | 2013-10-30 06:32:55 +0100 | [diff] [blame] | 271 | } |
| 272 | |
Junio C Hamano | e198b3a | 2018-09-25 13:25:04 -0700 | [diff] [blame] | 273 | struct refname_hash_entry { |
Eric Wong | e2b5038 | 2019-10-06 23:30:43 +0000 | [diff] [blame] | 274 | struct hashmap_entry ent; |
Junio C Hamano | e198b3a | 2018-09-25 13:25:04 -0700 | [diff] [blame] | 275 | struct object_id oid; |
Felipe Contreras | f80d922 | 2019-06-03 21:13:30 -0500 | [diff] [blame] | 276 | int ignore; |
Junio C Hamano | e198b3a | 2018-09-25 13:25:04 -0700 | [diff] [blame] | 277 | char refname[FLEX_ARRAY]; |
| 278 | }; |
| 279 | |
| 280 | static int refname_hash_entry_cmp(const void *hashmap_cmp_fn_data, |
Eric Wong | 939af16 | 2019-10-06 23:30:37 +0000 | [diff] [blame] | 281 | const struct hashmap_entry *eptr, |
| 282 | const struct hashmap_entry *entry_or_key, |
Junio C Hamano | e198b3a | 2018-09-25 13:25:04 -0700 | [diff] [blame] | 283 | const void *keydata) |
| 284 | { |
Eric Wong | 939af16 | 2019-10-06 23:30:37 +0000 | [diff] [blame] | 285 | const struct refname_hash_entry *e1, *e2; |
Junio C Hamano | e198b3a | 2018-09-25 13:25:04 -0700 | [diff] [blame] | 286 | |
Eric Wong | 939af16 | 2019-10-06 23:30:37 +0000 | [diff] [blame] | 287 | e1 = container_of(eptr, const struct refname_hash_entry, ent); |
| 288 | e2 = container_of(entry_or_key, const struct refname_hash_entry, ent); |
Junio C Hamano | e198b3a | 2018-09-25 13:25:04 -0700 | [diff] [blame] | 289 | return strcmp(e1->refname, keydata ? keydata : e2->refname); |
| 290 | } |
| 291 | |
| 292 | static struct refname_hash_entry *refname_hash_add(struct hashmap *map, |
| 293 | const char *refname, |
| 294 | const struct object_id *oid) |
| 295 | { |
| 296 | struct refname_hash_entry *ent; |
| 297 | size_t len = strlen(refname); |
| 298 | |
| 299 | FLEX_ALLOC_MEM(ent, refname, refname, len); |
Eric Wong | d22245a | 2019-10-06 23:30:27 +0000 | [diff] [blame] | 300 | hashmap_entry_init(&ent->ent, strhash(refname)); |
Junio C Hamano | e198b3a | 2018-09-25 13:25:04 -0700 | [diff] [blame] | 301 | oidcpy(&ent->oid, oid); |
Eric Wong | b94e5c1 | 2019-10-06 23:30:29 +0000 | [diff] [blame] | 302 | hashmap_add(map, &ent->ent); |
Junio C Hamano | e198b3a | 2018-09-25 13:25:04 -0700 | [diff] [blame] | 303 | return ent; |
| 304 | } |
| 305 | |
| 306 | static int add_one_refname(const char *refname, |
| 307 | const struct object_id *oid, |
| 308 | int flag, void *cbdata) |
| 309 | { |
| 310 | struct hashmap *refname_map = cbdata; |
| 311 | |
| 312 | (void) refname_hash_add(refname_map, refname, oid); |
| 313 | return 0; |
| 314 | } |
| 315 | |
| 316 | static void refname_hash_init(struct hashmap *map) |
| 317 | { |
| 318 | hashmap_init(map, refname_hash_entry_cmp, NULL, 0); |
| 319 | } |
| 320 | |
| 321 | static int refname_hash_exists(struct hashmap *map, const char *refname) |
| 322 | { |
| 323 | return !!hashmap_get_from_hash(map, strhash(refname), refname); |
| 324 | } |
| 325 | |
Felipe Contreras | a8363b5 | 2019-06-03 21:13:28 -0500 | [diff] [blame] | 326 | static void clear_item(struct refname_hash_entry *item) |
| 327 | { |
Felipe Contreras | f80d922 | 2019-06-03 21:13:30 -0500 | [diff] [blame] | 328 | item->ignore = 1; |
Felipe Contreras | a8363b5 | 2019-06-03 21:13:28 -0500 | [diff] [blame] | 329 | } |
| 330 | |
Brandon Williams | 6d1700d | 2018-06-27 15:30:21 -0700 | [diff] [blame] | 331 | static void find_non_local_tags(const struct ref *refs, |
| 332 | struct ref **head, |
| 333 | struct ref ***tail) |
Michael Haggerty | a0fbb5a | 2013-10-30 06:32:55 +0100 | [diff] [blame] | 334 | { |
Junio C Hamano | e198b3a | 2018-09-25 13:25:04 -0700 | [diff] [blame] | 335 | struct hashmap existing_refs; |
| 336 | struct hashmap remote_refs; |
Masaya Suzuki | b7e2d8b | 2019-09-15 14:18:02 -0700 | [diff] [blame] | 337 | struct oidset fetch_oids = OIDSET_INIT; |
Junio C Hamano | e198b3a | 2018-09-25 13:25:04 -0700 | [diff] [blame] | 338 | struct string_list remote_refs_list = STRING_LIST_INIT_NODUP; |
| 339 | struct string_list_item *remote_ref_item; |
Michael Haggerty | a0fbb5a | 2013-10-30 06:32:55 +0100 | [diff] [blame] | 340 | const struct ref *ref; |
Junio C Hamano | e198b3a | 2018-09-25 13:25:04 -0700 | [diff] [blame] | 341 | struct refname_hash_entry *item = NULL; |
Derrick Stolee | 3e96c66 | 2020-02-21 21:47:28 +0000 | [diff] [blame] | 342 | const int quick_flags = OBJECT_INFO_QUICK | OBJECT_INFO_SKIP_FETCH_OBJECT; |
Michael Haggerty | a0fbb5a | 2013-10-30 06:32:55 +0100 | [diff] [blame] | 343 | |
Junio C Hamano | e198b3a | 2018-09-25 13:25:04 -0700 | [diff] [blame] | 344 | refname_hash_init(&existing_refs); |
| 345 | refname_hash_init(&remote_refs); |
Masaya Suzuki | b7e2d8b | 2019-09-15 14:18:02 -0700 | [diff] [blame] | 346 | create_fetch_oidset(head, &fetch_oids); |
Junio C Hamano | e198b3a | 2018-09-25 13:25:04 -0700 | [diff] [blame] | 347 | |
| 348 | for_each_ref(add_one_refname, &existing_refs); |
Brandon Williams | 6d1700d | 2018-06-27 15:30:21 -0700 | [diff] [blame] | 349 | for (ref = refs; ref; ref = ref->next) { |
Junio C Hamano | ad70448 | 2013-12-17 11:47:35 -0800 | [diff] [blame] | 350 | if (!starts_with(ref->name, "refs/tags/")) |
Michael Haggerty | a0fbb5a | 2013-10-30 06:32:55 +0100 | [diff] [blame] | 351 | continue; |
| 352 | |
| 353 | /* |
| 354 | * The peeled ref always follows the matching base |
| 355 | * ref, so if we see a peeled ref that we don't want |
| 356 | * to fetch then we can mark the ref entry in the list |
| 357 | * as one to ignore by setting util to NULL. |
| 358 | */ |
Junio C Hamano | ad70448 | 2013-12-17 11:47:35 -0800 | [diff] [blame] | 359 | if (ends_with(ref->name, "^{}")) { |
Jeff King | 5827a03 | 2016-10-13 12:53:44 -0400 | [diff] [blame] | 360 | if (item && |
Derrick Stolee | 3e96c66 | 2020-02-21 21:47:28 +0000 | [diff] [blame] | 361 | !has_object_file_with_flags(&ref->old_oid, quick_flags) && |
Masaya Suzuki | b7e2d8b | 2019-09-15 14:18:02 -0700 | [diff] [blame] | 362 | !oidset_contains(&fetch_oids, &ref->old_oid) && |
Derrick Stolee | 3e96c66 | 2020-02-21 21:47:28 +0000 | [diff] [blame] | 363 | !has_object_file_with_flags(&item->oid, quick_flags) && |
Masaya Suzuki | b7e2d8b | 2019-09-15 14:18:02 -0700 | [diff] [blame] | 364 | !oidset_contains(&fetch_oids, &item->oid)) |
Felipe Contreras | a8363b5 | 2019-06-03 21:13:28 -0500 | [diff] [blame] | 365 | clear_item(item); |
Michael Haggerty | a0fbb5a | 2013-10-30 06:32:55 +0100 | [diff] [blame] | 366 | item = NULL; |
| 367 | continue; |
| 368 | } |
| 369 | |
| 370 | /* |
| 371 | * If item is non-NULL here, then we previously saw a |
| 372 | * ref not followed by a peeled reference, so we need |
| 373 | * to check if it is a lightweight tag that we want to |
| 374 | * fetch. |
| 375 | */ |
Jeff King | 5827a03 | 2016-10-13 12:53:44 -0400 | [diff] [blame] | 376 | if (item && |
Derrick Stolee | 3e96c66 | 2020-02-21 21:47:28 +0000 | [diff] [blame] | 377 | !has_object_file_with_flags(&item->oid, quick_flags) && |
Masaya Suzuki | b7e2d8b | 2019-09-15 14:18:02 -0700 | [diff] [blame] | 378 | !oidset_contains(&fetch_oids, &item->oid)) |
Felipe Contreras | a8363b5 | 2019-06-03 21:13:28 -0500 | [diff] [blame] | 379 | clear_item(item); |
Michael Haggerty | a0fbb5a | 2013-10-30 06:32:55 +0100 | [diff] [blame] | 380 | |
| 381 | item = NULL; |
| 382 | |
| 383 | /* skip duplicates and refs that we already have */ |
Junio C Hamano | e198b3a | 2018-09-25 13:25:04 -0700 | [diff] [blame] | 384 | if (refname_hash_exists(&remote_refs, ref->name) || |
| 385 | refname_hash_exists(&existing_refs, ref->name)) |
Michael Haggerty | a0fbb5a | 2013-10-30 06:32:55 +0100 | [diff] [blame] | 386 | continue; |
| 387 | |
Junio C Hamano | e198b3a | 2018-09-25 13:25:04 -0700 | [diff] [blame] | 388 | item = refname_hash_add(&remote_refs, ref->name, &ref->old_oid); |
| 389 | string_list_insert(&remote_refs_list, ref->name); |
Michael Haggerty | a0fbb5a | 2013-10-30 06:32:55 +0100 | [diff] [blame] | 390 | } |
Eric Wong | c8e424c | 2019-10-06 23:30:40 +0000 | [diff] [blame] | 391 | hashmap_free_entries(&existing_refs, struct refname_hash_entry, ent); |
Michael Haggerty | a0fbb5a | 2013-10-30 06:32:55 +0100 | [diff] [blame] | 392 | |
| 393 | /* |
| 394 | * We may have a final lightweight tag that needs to be |
| 395 | * checked to see if it needs fetching. |
| 396 | */ |
Jeff King | 5827a03 | 2016-10-13 12:53:44 -0400 | [diff] [blame] | 397 | if (item && |
Derrick Stolee | 3e96c66 | 2020-02-21 21:47:28 +0000 | [diff] [blame] | 398 | !has_object_file_with_flags(&item->oid, quick_flags) && |
Masaya Suzuki | b7e2d8b | 2019-09-15 14:18:02 -0700 | [diff] [blame] | 399 | !oidset_contains(&fetch_oids, &item->oid)) |
Felipe Contreras | a8363b5 | 2019-06-03 21:13:28 -0500 | [diff] [blame] | 400 | clear_item(item); |
Michael Haggerty | a0fbb5a | 2013-10-30 06:32:55 +0100 | [diff] [blame] | 401 | |
| 402 | /* |
Junio C Hamano | e198b3a | 2018-09-25 13:25:04 -0700 | [diff] [blame] | 403 | * For all the tags in the remote_refs_list, |
Michael Haggerty | a0fbb5a | 2013-10-30 06:32:55 +0100 | [diff] [blame] | 404 | * add them to the list of refs to be fetched |
| 405 | */ |
Junio C Hamano | e198b3a | 2018-09-25 13:25:04 -0700 | [diff] [blame] | 406 | for_each_string_list_item(remote_ref_item, &remote_refs_list) { |
| 407 | const char *refname = remote_ref_item->string; |
Felipe Contreras | 9528b80 | 2019-06-03 21:13:29 -0500 | [diff] [blame] | 408 | struct ref *rm; |
Eric Wong | f23a465 | 2019-10-06 23:30:36 +0000 | [diff] [blame] | 409 | unsigned int hash = strhash(refname); |
Junio C Hamano | e198b3a | 2018-09-25 13:25:04 -0700 | [diff] [blame] | 410 | |
Eric Wong | f23a465 | 2019-10-06 23:30:36 +0000 | [diff] [blame] | 411 | item = hashmap_get_entry_from_hash(&remote_refs, hash, refname, |
| 412 | struct refname_hash_entry, ent); |
Junio C Hamano | e198b3a | 2018-09-25 13:25:04 -0700 | [diff] [blame] | 413 | if (!item) |
| 414 | BUG("unseen remote ref?"); |
| 415 | |
Michael Haggerty | a0fbb5a | 2013-10-30 06:32:55 +0100 | [diff] [blame] | 416 | /* Unless we have already decided to ignore this item... */ |
Felipe Contreras | f80d922 | 2019-06-03 21:13:30 -0500 | [diff] [blame] | 417 | if (item->ignore) |
Felipe Contreras | 9528b80 | 2019-06-03 21:13:29 -0500 | [diff] [blame] | 418 | continue; |
| 419 | |
| 420 | rm = alloc_ref(item->refname); |
| 421 | rm->peer_ref = alloc_ref(item->refname); |
| 422 | oidcpy(&rm->old_oid, &item->oid); |
| 423 | **tail = rm; |
| 424 | *tail = &rm->next; |
Michael Haggerty | a0fbb5a | 2013-10-30 06:32:55 +0100 | [diff] [blame] | 425 | } |
Eric Wong | c8e424c | 2019-10-06 23:30:40 +0000 | [diff] [blame] | 426 | hashmap_free_entries(&remote_refs, struct refname_hash_entry, ent); |
Junio C Hamano | e198b3a | 2018-09-25 13:25:04 -0700 | [diff] [blame] | 427 | string_list_clear(&remote_refs_list, 0); |
Masaya Suzuki | b7e2d8b | 2019-09-15 14:18:02 -0700 | [diff] [blame] | 428 | oidset_clear(&fetch_oids); |
Michael Haggerty | a0fbb5a | 2013-10-30 06:32:55 +0100 | [diff] [blame] | 429 | } |
Shawn O. Pearce | 767f176 | 2008-03-02 21:35:25 -0500 | [diff] [blame] | 430 | |
Brandon Williams | 6d1700d | 2018-06-27 15:30:21 -0700 | [diff] [blame] | 431 | static struct ref *get_ref_map(struct remote *remote, |
| 432 | const struct ref *remote_refs, |
Brandon Williams | 65d96c8 | 2018-05-16 15:58:08 -0700 | [diff] [blame] | 433 | struct refspec *rs, |
Michael Haggerty | f137a45 | 2013-10-23 17:50:38 +0200 | [diff] [blame] | 434 | int tags, int *autotags) |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 435 | { |
| 436 | int i; |
| 437 | struct ref *rm; |
| 438 | struct ref *ref_map = NULL; |
| 439 | struct ref **tail = &ref_map; |
| 440 | |
Michael Haggerty | c5a84e9 | 2013-10-30 06:32:59 +0100 | [diff] [blame] | 441 | /* opportunistically-updated references: */ |
| 442 | struct ref *orefs = NULL, **oref_tail = &orefs; |
| 443 | |
Junio C Hamano | e198b3a | 2018-09-25 13:25:04 -0700 | [diff] [blame] | 444 | struct hashmap existing_refs; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 445 | |
Brandon Williams | 65d96c8 | 2018-05-16 15:58:08 -0700 | [diff] [blame] | 446 | if (rs->nr) { |
Junio C Hamano | c5558f8 | 2014-05-29 15:21:31 -0700 | [diff] [blame] | 447 | struct refspec *fetch_refspec; |
Junio C Hamano | c5558f8 | 2014-05-29 15:21:31 -0700 | [diff] [blame] | 448 | |
Brandon Williams | 65d96c8 | 2018-05-16 15:58:08 -0700 | [diff] [blame] | 449 | for (i = 0; i < rs->nr; i++) { |
| 450 | get_fetch_map(remote_refs, &rs->items[i], &tail, 0); |
| 451 | if (rs->items[i].dst && rs->items[i].dst[0]) |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 452 | *autotags = 1; |
| 453 | } |
Michael Haggerty | 0281c93 | 2013-10-30 06:32:58 +0100 | [diff] [blame] | 454 | /* Merge everything on the command line (but not --tags) */ |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 455 | for (rm = ref_map; rm; rm = rm->next) |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 456 | rm->fetch_head_status = FETCH_HEAD_MERGE; |
Michael Haggerty | 0281c93 | 2013-10-30 06:32:58 +0100 | [diff] [blame] | 457 | |
| 458 | /* |
| 459 | * For any refs that we happen to be fetching via |
| 460 | * command-line arguments, the destination ref might |
| 461 | * have been missing or have been different than the |
| 462 | * remote-tracking ref that would be derived from the |
| 463 | * configured refspec. In these cases, we want to |
| 464 | * take the opportunity to update their configured |
| 465 | * remote-tracking reference. However, we do not want |
| 466 | * to mention these entries in FETCH_HEAD at all, as |
| 467 | * they would simply be duplicates of existing |
| 468 | * entries, so we set them FETCH_HEAD_IGNORE below. |
| 469 | * |
| 470 | * We compute these entries now, based only on the |
| 471 | * refspecs specified on the command line. But we add |
| 472 | * them to the list following the refspecs resulting |
| 473 | * from the tags option so that one of the latter, |
| 474 | * which has FETCH_HEAD_NOT_FOR_MERGE, is not removed |
| 475 | * by ref_remove_duplicates() in favor of one of these |
| 476 | * opportunistic entries with FETCH_HEAD_IGNORE. |
| 477 | */ |
Brandon Williams | 65d96c8 | 2018-05-16 15:58:08 -0700 | [diff] [blame] | 478 | if (refmap.nr) |
| 479 | fetch_refspec = &refmap; |
| 480 | else |
Brandon Williams | 6d1700d | 2018-06-27 15:30:21 -0700 | [diff] [blame] | 481 | fetch_refspec = &remote->fetch; |
Junio C Hamano | c5558f8 | 2014-05-29 15:21:31 -0700 | [diff] [blame] | 482 | |
Brandon Williams | 65d96c8 | 2018-05-16 15:58:08 -0700 | [diff] [blame] | 483 | for (i = 0; i < fetch_refspec->nr; i++) |
| 484 | get_fetch_map(ref_map, &fetch_refspec->items[i], &oref_tail, 1); |
Brandon Williams | e4cffac | 2018-05-16 15:58:05 -0700 | [diff] [blame] | 485 | } else if (refmap.nr) { |
Junio C Hamano | c5558f8 | 2014-05-29 15:21:31 -0700 | [diff] [blame] | 486 | die("--refmap option is only meaningful with command-line refspec(s)."); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 487 | } else { |
| 488 | /* Use the defaults */ |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 489 | struct branch *branch = branch_get(NULL); |
| 490 | int has_merge = branch_has_merge_config(branch); |
Brandon Casey | 3ee1757 | 2010-08-25 12:52:56 -0500 | [diff] [blame] | 491 | if (remote && |
Brandon Williams | e5349ab | 2018-05-16 15:58:01 -0700 | [diff] [blame] | 492 | (remote->fetch.nr || |
Brandon Casey | f31dbdc | 2010-09-09 13:56:36 -0500 | [diff] [blame] | 493 | /* Note: has_merge implies non-NULL branch->remote_name */ |
Brandon Casey | 3ee1757 | 2010-08-25 12:52:56 -0500 | [diff] [blame] | 494 | (has_merge && !strcmp(branch->remote_name, remote->name)))) { |
Brandon Williams | e5349ab | 2018-05-16 15:58:01 -0700 | [diff] [blame] | 495 | for (i = 0; i < remote->fetch.nr; i++) { |
| 496 | get_fetch_map(remote_refs, &remote->fetch.items[i], &tail, 0); |
| 497 | if (remote->fetch.items[i].dst && |
| 498 | remote->fetch.items[i].dst[0]) |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 499 | *autotags = 1; |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 500 | if (!i && !has_merge && ref_map && |
Brandon Williams | e5349ab | 2018-05-16 15:58:01 -0700 | [diff] [blame] | 501 | !remote->fetch.items[0].pattern) |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 502 | ref_map->fetch_head_status = FETCH_HEAD_MERGE; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 503 | } |
Johannes Schindelin | da0204d | 2007-10-11 01:47:55 +0100 | [diff] [blame] | 504 | /* |
| 505 | * if the remote we're fetching from is the same |
| 506 | * as given in branch.<name>.remote, we add the |
| 507 | * ref given in branch.<name>.merge, too. |
Brandon Casey | f31dbdc | 2010-09-09 13:56:36 -0500 | [diff] [blame] | 508 | * |
| 509 | * Note: has_merge implies non-NULL branch->remote_name |
Johannes Schindelin | da0204d | 2007-10-11 01:47:55 +0100 | [diff] [blame] | 510 | */ |
Junio C Hamano | 9ad7c5a | 2007-10-26 23:09:48 -0700 | [diff] [blame] | 511 | if (has_merge && |
| 512 | !strcmp(branch->remote_name, remote->name)) |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 513 | add_merge_config(&ref_map, remote_refs, branch, &tail); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 514 | } else { |
| 515 | ref_map = get_remote_ref(remote_refs, "HEAD"); |
Junio C Hamano | 9ad7c5a | 2007-10-26 23:09:48 -0700 | [diff] [blame] | 516 | if (!ref_map) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 517 | die(_("Couldn't find remote ref HEAD")); |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 518 | ref_map->fetch_head_status = FETCH_HEAD_MERGE; |
Shawn O. Pearce | 5aaf7f2 | 2008-03-02 21:34:51 -0500 | [diff] [blame] | 519 | tail = &ref_map->next; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 520 | } |
| 521 | } |
Michael Haggerty | 0281c93 | 2013-10-30 06:32:58 +0100 | [diff] [blame] | 522 | |
Michael Haggerty | c5a84e9 | 2013-10-30 06:32:59 +0100 | [diff] [blame] | 523 | if (tags == TAGS_SET) |
| 524 | /* also fetch all tags */ |
| 525 | get_fetch_map(remote_refs, tag_refspec, &tail, 0); |
| 526 | else if (tags == TAGS_DEFAULT && *autotags) |
Brandon Williams | 6d1700d | 2018-06-27 15:30:21 -0700 | [diff] [blame] | 527 | find_non_local_tags(remote_refs, &ref_map, &tail); |
Michael Haggerty | 0281c93 | 2013-10-30 06:32:58 +0100 | [diff] [blame] | 528 | |
Michael Haggerty | c5a84e9 | 2013-10-30 06:32:59 +0100 | [diff] [blame] | 529 | /* Now append any refs to be updated opportunistically: */ |
| 530 | *tail = orefs; |
| 531 | for (rm = orefs; rm; rm = rm->next) { |
| 532 | rm->fetch_head_status = FETCH_HEAD_IGNORE; |
| 533 | tail = &rm->next; |
| 534 | } |
| 535 | |
Brandon Williams | 14b8ced | 2018-06-27 15:30:19 -0700 | [diff] [blame] | 536 | ref_map = ref_remove_duplicates(ref_map); |
| 537 | |
Junio C Hamano | e198b3a | 2018-09-25 13:25:04 -0700 | [diff] [blame] | 538 | refname_hash_init(&existing_refs); |
| 539 | for_each_ref(add_one_refname, &existing_refs); |
| 540 | |
Brandon Williams | 14b8ced | 2018-06-27 15:30:19 -0700 | [diff] [blame] | 541 | for (rm = ref_map; rm; rm = rm->next) { |
| 542 | if (rm->peer_ref) { |
Junio C Hamano | e198b3a | 2018-09-25 13:25:04 -0700 | [diff] [blame] | 543 | const char *refname = rm->peer_ref->name; |
| 544 | struct refname_hash_entry *peer_item; |
Eric Wong | f23a465 | 2019-10-06 23:30:36 +0000 | [diff] [blame] | 545 | unsigned int hash = strhash(refname); |
Junio C Hamano | e198b3a | 2018-09-25 13:25:04 -0700 | [diff] [blame] | 546 | |
Eric Wong | f23a465 | 2019-10-06 23:30:36 +0000 | [diff] [blame] | 547 | peer_item = hashmap_get_entry_from_hash(&existing_refs, |
| 548 | hash, refname, |
| 549 | struct refname_hash_entry, ent); |
Brandon Williams | 14b8ced | 2018-06-27 15:30:19 -0700 | [diff] [blame] | 550 | if (peer_item) { |
Junio C Hamano | e198b3a | 2018-09-25 13:25:04 -0700 | [diff] [blame] | 551 | struct object_id *old_oid = &peer_item->oid; |
Brandon Williams | 14b8ced | 2018-06-27 15:30:19 -0700 | [diff] [blame] | 552 | oidcpy(&rm->peer_ref->old_oid, old_oid); |
| 553 | } |
| 554 | } |
| 555 | } |
Eric Wong | c8e424c | 2019-10-06 23:30:40 +0000 | [diff] [blame] | 556 | hashmap_free_entries(&existing_refs, struct refname_hash_entry, ent); |
Brandon Williams | 14b8ced | 2018-06-27 15:30:19 -0700 | [diff] [blame] | 557 | |
| 558 | return ref_map; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 559 | } |
| 560 | |
Jeff King | fa25075 | 2009-05-25 06:40:54 -0400 | [diff] [blame] | 561 | #define STORE_REF_ERROR_OTHER 1 |
| 562 | #define STORE_REF_ERROR_DF_CONFLICT 2 |
| 563 | |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 564 | static int s_update_ref(const char *action, |
| 565 | struct ref *ref, |
| 566 | int check_old) |
| 567 | { |
Jeff King | 1412f76 | 2017-03-28 15:46:26 -0400 | [diff] [blame] | 568 | char *msg; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 569 | char *rla = getenv("GIT_REFLOG_ACTION"); |
Ronnie Sahlberg | cd94f76 | 2014-04-28 13:49:07 -0700 | [diff] [blame] | 570 | struct ref_transaction *transaction; |
| 571 | struct strbuf err = STRBUF_INIT; |
| 572 | int ret, df_conflict = 0; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 573 | |
Jay Soffian | 28a1540 | 2009-11-10 09:19:43 +0100 | [diff] [blame] | 574 | if (dry_run) |
| 575 | return 0; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 576 | if (!rla) |
Kristian Høgsberg | 2d324ef | 2007-12-04 02:25:46 -0500 | [diff] [blame] | 577 | rla = default_rla.buf; |
Jeff King | 1412f76 | 2017-03-28 15:46:26 -0400 | [diff] [blame] | 578 | msg = xstrfmt("%s: %s", rla, action); |
Ronnie Sahlberg | cd94f76 | 2014-04-28 13:49:07 -0700 | [diff] [blame] | 579 | |
| 580 | transaction = ref_transaction_begin(&err); |
| 581 | if (!transaction || |
Michael Haggerty | 1d147bd | 2015-02-17 18:00:15 +0100 | [diff] [blame] | 582 | ref_transaction_update(transaction, ref->name, |
brian m. carlson | 89f3bbd | 2017-10-15 22:06:53 +0000 | [diff] [blame] | 583 | &ref->new_oid, |
| 584 | check_old ? &ref->old_oid : NULL, |
Michael Haggerty | 1d147bd | 2015-02-17 18:00:15 +0100 | [diff] [blame] | 585 | 0, msg, &err)) |
Ronnie Sahlberg | cd94f76 | 2014-04-28 13:49:07 -0700 | [diff] [blame] | 586 | goto fail; |
| 587 | |
| 588 | ret = ref_transaction_commit(transaction, &err); |
| 589 | if (ret) { |
| 590 | df_conflict = (ret == TRANSACTION_NAME_CONFLICT); |
| 591 | goto fail; |
| 592 | } |
| 593 | |
| 594 | ref_transaction_free(transaction); |
| 595 | strbuf_release(&err); |
Jeff King | 1412f76 | 2017-03-28 15:46:26 -0400 | [diff] [blame] | 596 | free(msg); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 597 | return 0; |
Ronnie Sahlberg | cd94f76 | 2014-04-28 13:49:07 -0700 | [diff] [blame] | 598 | fail: |
| 599 | ref_transaction_free(transaction); |
| 600 | error("%s", err.buf); |
| 601 | strbuf_release(&err); |
Jeff King | 1412f76 | 2017-03-28 15:46:26 -0400 | [diff] [blame] | 602 | free(msg); |
Ronnie Sahlberg | cd94f76 | 2014-04-28 13:49:07 -0700 | [diff] [blame] | 603 | return df_conflict ? STORE_REF_ERROR_DF_CONFLICT |
| 604 | : STORE_REF_ERROR_OTHER; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 605 | } |
| 606 | |
Nguyễn Thái Ngọc Duy | 6bc91f2 | 2016-07-01 18:03:30 +0200 | [diff] [blame] | 607 | static int refcol_width = 10; |
Nguyễn Thái Ngọc Duy | bc437d1 | 2016-07-01 18:03:31 +0200 | [diff] [blame] | 608 | static int compact_format; |
Nguyễn Thái Ngọc Duy | 6bc91f2 | 2016-07-01 18:03:30 +0200 | [diff] [blame] | 609 | |
| 610 | static void adjust_refcol_width(const struct ref *ref) |
| 611 | { |
| 612 | int max, rlen, llen, len; |
| 613 | |
| 614 | /* uptodate lines are only shown on high verbosity level */ |
Jeff King | 4a7e27e | 2018-08-28 17:22:40 -0400 | [diff] [blame] | 615 | if (!verbosity && oideq(&ref->peer_ref->old_oid, &ref->old_oid)) |
Nguyễn Thái Ngọc Duy | 6bc91f2 | 2016-07-01 18:03:30 +0200 | [diff] [blame] | 616 | return; |
| 617 | |
| 618 | max = term_columns(); |
| 619 | rlen = utf8_strwidth(prettify_refname(ref->name)); |
Nguyễn Thái Ngọc Duy | bc437d1 | 2016-07-01 18:03:31 +0200 | [diff] [blame] | 620 | |
Nguyễn Thái Ngọc Duy | 6bc91f2 | 2016-07-01 18:03:30 +0200 | [diff] [blame] | 621 | llen = utf8_strwidth(prettify_refname(ref->peer_ref->name)); |
| 622 | |
| 623 | /* |
| 624 | * rough estimation to see if the output line is too long and |
| 625 | * should not be counted (we can't do precise calculation |
| 626 | * anyway because we don't know if the error explanation part |
| 627 | * will be printed in update_local_ref) |
| 628 | */ |
Nguyễn Thái Ngọc Duy | bc437d1 | 2016-07-01 18:03:31 +0200 | [diff] [blame] | 629 | if (compact_format) { |
| 630 | llen = 0; |
| 631 | max = max * 2 / 3; |
| 632 | } |
Nguyễn Thái Ngọc Duy | 6bc91f2 | 2016-07-01 18:03:30 +0200 | [diff] [blame] | 633 | len = 21 /* flag and summary */ + rlen + 4 /* -> */ + llen; |
| 634 | if (len >= max) |
| 635 | return; |
| 636 | |
Nguyễn Thái Ngọc Duy | bc437d1 | 2016-07-01 18:03:31 +0200 | [diff] [blame] | 637 | /* |
| 638 | * Not precise calculation for compact mode because '*' can |
| 639 | * appear on the left hand side of '->' and shrink the column |
| 640 | * back. |
| 641 | */ |
Nguyễn Thái Ngọc Duy | 6bc91f2 | 2016-07-01 18:03:30 +0200 | [diff] [blame] | 642 | if (refcol_width < rlen) |
| 643 | refcol_width = rlen; |
| 644 | } |
| 645 | |
| 646 | static void prepare_format_display(struct ref *ref_map) |
| 647 | { |
| 648 | struct ref *rm; |
Nguyễn Thái Ngọc Duy | bc437d1 | 2016-07-01 18:03:31 +0200 | [diff] [blame] | 649 | const char *format = "full"; |
| 650 | |
Jeff King | f1de981 | 2020-08-14 12:17:36 -0400 | [diff] [blame] | 651 | git_config_get_string_tmp("fetch.output", &format); |
Nguyễn Thái Ngọc Duy | bc437d1 | 2016-07-01 18:03:31 +0200 | [diff] [blame] | 652 | if (!strcasecmp(format, "full")) |
| 653 | compact_format = 0; |
| 654 | else if (!strcasecmp(format, "compact")) |
| 655 | compact_format = 1; |
| 656 | else |
| 657 | die(_("configuration fetch.output contains invalid value %s"), |
| 658 | format); |
Nguyễn Thái Ngọc Duy | 6bc91f2 | 2016-07-01 18:03:30 +0200 | [diff] [blame] | 659 | |
| 660 | for (rm = ref_map; rm; rm = rm->next) { |
| 661 | if (rm->status == REF_STATUS_REJECT_SHALLOW || |
| 662 | !rm->peer_ref || |
| 663 | !strcmp(rm->name, "HEAD")) |
| 664 | continue; |
| 665 | |
| 666 | adjust_refcol_width(rm); |
| 667 | } |
| 668 | } |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 669 | |
Nguyễn Thái Ngọc Duy | bc437d1 | 2016-07-01 18:03:31 +0200 | [diff] [blame] | 670 | static void print_remote_to_local(struct strbuf *display, |
| 671 | const char *remote, const char *local) |
| 672 | { |
| 673 | strbuf_addf(display, "%-*s -> %s", refcol_width, remote, local); |
| 674 | } |
| 675 | |
| 676 | static int find_and_replace(struct strbuf *haystack, |
| 677 | const char *needle, |
| 678 | const char *placeholder) |
| 679 | { |
Nguyễn Thái Ngọc Duy | dc40b24 | 2019-01-25 16:51:22 +0700 | [diff] [blame] | 680 | const char *p = NULL; |
Nguyễn Thái Ngọc Duy | bc437d1 | 2016-07-01 18:03:31 +0200 | [diff] [blame] | 681 | int plen, nlen; |
| 682 | |
Nguyễn Thái Ngọc Duy | dc40b24 | 2019-01-25 16:51:22 +0700 | [diff] [blame] | 683 | nlen = strlen(needle); |
| 684 | if (ends_with(haystack->buf, needle)) |
| 685 | p = haystack->buf + haystack->len - nlen; |
| 686 | else |
| 687 | p = strstr(haystack->buf, needle); |
Nguyễn Thái Ngọc Duy | bc437d1 | 2016-07-01 18:03:31 +0200 | [diff] [blame] | 688 | if (!p) |
| 689 | return 0; |
| 690 | |
| 691 | if (p > haystack->buf && p[-1] != '/') |
| 692 | return 0; |
| 693 | |
| 694 | plen = strlen(p); |
Nguyễn Thái Ngọc Duy | bc437d1 | 2016-07-01 18:03:31 +0200 | [diff] [blame] | 695 | if (plen > nlen && p[nlen] != '/') |
| 696 | return 0; |
| 697 | |
| 698 | strbuf_splice(haystack, p - haystack->buf, nlen, |
| 699 | placeholder, strlen(placeholder)); |
| 700 | return 1; |
| 701 | } |
| 702 | |
| 703 | static void print_compact(struct strbuf *display, |
| 704 | const char *remote, const char *local) |
| 705 | { |
| 706 | struct strbuf r = STRBUF_INIT; |
| 707 | struct strbuf l = STRBUF_INIT; |
| 708 | |
| 709 | if (!strcmp(remote, local)) { |
| 710 | strbuf_addf(display, "%-*s -> *", refcol_width, remote); |
| 711 | return; |
| 712 | } |
| 713 | |
| 714 | strbuf_addstr(&r, remote); |
| 715 | strbuf_addstr(&l, local); |
| 716 | |
| 717 | if (!find_and_replace(&r, local, "*")) |
| 718 | find_and_replace(&l, remote, "*"); |
| 719 | print_remote_to_local(display, r.buf, l.buf); |
| 720 | |
| 721 | strbuf_release(&r); |
| 722 | strbuf_release(&l); |
| 723 | } |
| 724 | |
Nguyễn Thái Ngọc Duy | d0b39a0 | 2016-06-26 07:58:07 +0200 | [diff] [blame] | 725 | static void format_display(struct strbuf *display, char code, |
| 726 | const char *summary, const char *error, |
Junio C Hamano | 901f3d4 | 2016-10-21 15:22:55 -0700 | [diff] [blame] | 727 | const char *remote, const char *local, |
| 728 | int summary_width) |
Nguyễn Thái Ngọc Duy | d0b39a0 | 2016-06-26 07:58:07 +0200 | [diff] [blame] | 729 | { |
Junio C Hamano | 901f3d4 | 2016-10-21 15:22:55 -0700 | [diff] [blame] | 730 | int width = (summary_width + strlen(summary) - gettext_width(summary)); |
| 731 | |
| 732 | strbuf_addf(display, "%c %-*s ", code, width, summary); |
Nguyễn Thái Ngọc Duy | bc437d1 | 2016-07-01 18:03:31 +0200 | [diff] [blame] | 733 | if (!compact_format) |
| 734 | print_remote_to_local(display, remote, local); |
| 735 | else |
| 736 | print_compact(display, remote, local); |
Nguyễn Thái Ngọc Duy | d0b39a0 | 2016-06-26 07:58:07 +0200 | [diff] [blame] | 737 | if (error) |
| 738 | strbuf_addf(display, " (%s)", error); |
| 739 | } |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 740 | |
| 741 | static int update_local_ref(struct ref *ref, |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 742 | const char *remote, |
Marc Branchaud | 6da618d | 2012-04-16 18:08:49 -0400 | [diff] [blame] | 743 | const struct ref *remote_ref, |
Junio C Hamano | 901f3d4 | 2016-10-21 15:22:55 -0700 | [diff] [blame] | 744 | struct strbuf *display, |
| 745 | int summary_width) |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 746 | { |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 747 | struct commit *current = NULL, *updated; |
| 748 | enum object_type type; |
| 749 | struct branch *current_branch = branch_get(NULL); |
Felipe Contreras | 4577e48 | 2009-05-14 00:22:04 +0300 | [diff] [blame] | 750 | const char *pretty_ref = prettify_refname(ref->name); |
Derrick Stolee | 377444b | 2019-06-18 13:25:27 -0700 | [diff] [blame] | 751 | int fast_forward = 0; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 752 | |
Stefan Beller | 0df8e96 | 2018-04-25 11:20:59 -0700 | [diff] [blame] | 753 | type = oid_object_info(the_repository, &ref->new_oid, NULL); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 754 | if (type < 0) |
brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 +0000 | [diff] [blame] | 755 | die(_("object %s not found"), oid_to_hex(&ref->new_oid)); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 756 | |
Jeff King | 4a7e27e | 2018-08-28 17:22:40 -0400 | [diff] [blame] | 757 | if (oideq(&ref->old_oid, &ref->new_oid)) { |
Tuncer Ayaz | 7f87aff | 2008-11-15 01:14:24 +0100 | [diff] [blame] | 758 | if (verbosity > 0) |
Nguyễn Thái Ngọc Duy | d0b39a0 | 2016-06-26 07:58:07 +0200 | [diff] [blame] | 759 | format_display(display, '=', _("[up to date]"), NULL, |
Junio C Hamano | 901f3d4 | 2016-10-21 15:22:55 -0700 | [diff] [blame] | 760 | remote, pretty_ref, summary_width); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 761 | return 0; |
| 762 | } |
| 763 | |
Shawn O. Pearce | b3abdd9 | 2007-09-16 02:31:26 -0400 | [diff] [blame] | 764 | if (current_branch && |
| 765 | !strcmp(ref->name, current_branch->name) && |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 766 | !(update_head_ok || is_bare_repository()) && |
brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 +0000 | [diff] [blame] | 767 | !is_null_oid(&ref->old_oid)) { |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 768 | /* |
| 769 | * If this is the head, and it's not okay to update |
| 770 | * the head, and the old value of the head isn't empty... |
| 771 | */ |
Nguyễn Thái Ngọc Duy | d0b39a0 | 2016-06-26 07:58:07 +0200 | [diff] [blame] | 772 | format_display(display, '!', _("[rejected]"), |
| 773 | _("can't fetch in current branch"), |
Junio C Hamano | 901f3d4 | 2016-10-21 15:22:55 -0700 | [diff] [blame] | 774 | remote, pretty_ref, summary_width); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 775 | return 1; |
| 776 | } |
| 777 | |
brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 +0000 | [diff] [blame] | 778 | if (!is_null_oid(&ref->old_oid) && |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 779 | starts_with(ref->name, "refs/tags/")) { |
Ævar Arnfjörð Bjarmason | 0bc8d71 | 2018-08-31 20:10:04 +0000 | [diff] [blame] | 780 | if (force || ref->force) { |
| 781 | int r; |
| 782 | r = s_update_ref("updating tag", ref, 0); |
| 783 | format_display(display, r ? '!' : 't', _("[tag update]"), |
| 784 | r ? _("unable to update local ref") : NULL, |
| 785 | remote, pretty_ref, summary_width); |
| 786 | return r; |
| 787 | } else { |
| 788 | format_display(display, '!', _("[rejected]"), _("would clobber existing tag"), |
| 789 | remote, pretty_ref, summary_width); |
| 790 | return 1; |
| 791 | } |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 792 | } |
| 793 | |
Stefan Beller | 21e1ee8 | 2018-06-28 18:21:57 -0700 | [diff] [blame] | 794 | current = lookup_commit_reference_gently(the_repository, |
| 795 | &ref->old_oid, 1); |
| 796 | updated = lookup_commit_reference_gently(the_repository, |
| 797 | &ref->new_oid, 1); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 798 | if (!current || !updated) { |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 799 | const char *msg; |
| 800 | const char *what; |
Jeff King | 6315472 | 2008-06-26 23:59:50 -0400 | [diff] [blame] | 801 | int r; |
Marc Branchaud | 0997ada | 2012-04-16 18:08:50 -0400 | [diff] [blame] | 802 | /* |
| 803 | * Nicely describe the new ref we're fetching. |
| 804 | * Base this on the remote's ref name, as it's |
| 805 | * more likely to follow a standard layout. |
| 806 | */ |
| 807 | const char *name = remote_ref ? remote_ref->name : ""; |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 808 | if (starts_with(name, "refs/tags/")) { |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 809 | msg = "storing tag"; |
Ævar Arnfjörð Bjarmason | f7b3742 | 2011-02-22 23:41:53 +0000 | [diff] [blame] | 810 | what = _("[new tag]"); |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 811 | } else if (starts_with(name, "refs/heads/")) { |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 812 | msg = "storing head"; |
Ævar Arnfjörð Bjarmason | f7b3742 | 2011-02-22 23:41:53 +0000 | [diff] [blame] | 813 | what = _("[new branch]"); |
Marc Branchaud | 0997ada | 2012-04-16 18:08:50 -0400 | [diff] [blame] | 814 | } else { |
| 815 | msg = "storing ref"; |
| 816 | what = _("[new ref]"); |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 817 | } |
| 818 | |
Jeff King | 6315472 | 2008-06-26 23:59:50 -0400 | [diff] [blame] | 819 | r = s_update_ref(msg, ref, 0); |
Nguyễn Thái Ngọc Duy | d0b39a0 | 2016-06-26 07:58:07 +0200 | [diff] [blame] | 820 | format_display(display, r ? '!' : '*', what, |
| 821 | r ? _("unable to update local ref") : NULL, |
Junio C Hamano | 901f3d4 | 2016-10-21 15:22:55 -0700 | [diff] [blame] | 822 | remote, pretty_ref, summary_width); |
Jeff King | 6315472 | 2008-06-26 23:59:50 -0400 | [diff] [blame] | 823 | return r; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 824 | } |
| 825 | |
Derrick Stolee | 377444b | 2019-06-18 13:25:27 -0700 | [diff] [blame] | 826 | if (fetch_show_forced_updates) { |
| 827 | uint64_t t_before = getnanotime(); |
| 828 | fast_forward = in_merge_bases(current, updated); |
| 829 | forced_updates_ms += (getnanotime() - t_before) / 1000000; |
| 830 | } else { |
| 831 | fast_forward = 1; |
| 832 | } |
| 833 | |
| 834 | if (fast_forward) { |
Jeff King | bd22d4f | 2015-09-24 17:07:40 -0400 | [diff] [blame] | 835 | struct strbuf quickref = STRBUF_INIT; |
Jeff King | 6315472 | 2008-06-26 23:59:50 -0400 | [diff] [blame] | 836 | int r; |
Derrick Stolee | cdbd70c | 2019-06-18 13:25:26 -0700 | [diff] [blame] | 837 | |
brian m. carlson | 30e677e | 2018-03-12 02:27:28 +0000 | [diff] [blame] | 838 | strbuf_add_unique_abbrev(&quickref, ¤t->object.oid, DEFAULT_ABBREV); |
Jeff King | bd22d4f | 2015-09-24 17:07:40 -0400 | [diff] [blame] | 839 | strbuf_addstr(&quickref, ".."); |
brian m. carlson | 30e677e | 2018-03-12 02:27:28 +0000 | [diff] [blame] | 840 | strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV); |
Felipe Contreras | a75d7b5 | 2009-10-24 11:31:32 +0300 | [diff] [blame] | 841 | r = s_update_ref("fast-forward", ref, 1); |
Nguyễn Thái Ngọc Duy | d0b39a0 | 2016-06-26 07:58:07 +0200 | [diff] [blame] | 842 | format_display(display, r ? '!' : ' ', quickref.buf, |
| 843 | r ? _("unable to update local ref") : NULL, |
Junio C Hamano | 901f3d4 | 2016-10-21 15:22:55 -0700 | [diff] [blame] | 844 | remote, pretty_ref, summary_width); |
Jeff King | bd22d4f | 2015-09-24 17:07:40 -0400 | [diff] [blame] | 845 | strbuf_release(&quickref); |
Jeff King | 6315472 | 2008-06-26 23:59:50 -0400 | [diff] [blame] | 846 | return r; |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 847 | } else if (force || ref->force) { |
Jeff King | bd22d4f | 2015-09-24 17:07:40 -0400 | [diff] [blame] | 848 | struct strbuf quickref = STRBUF_INIT; |
Jeff King | 6315472 | 2008-06-26 23:59:50 -0400 | [diff] [blame] | 849 | int r; |
brian m. carlson | 30e677e | 2018-03-12 02:27:28 +0000 | [diff] [blame] | 850 | strbuf_add_unique_abbrev(&quickref, ¤t->object.oid, DEFAULT_ABBREV); |
Jeff King | bd22d4f | 2015-09-24 17:07:40 -0400 | [diff] [blame] | 851 | strbuf_addstr(&quickref, "..."); |
brian m. carlson | 30e677e | 2018-03-12 02:27:28 +0000 | [diff] [blame] | 852 | strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV); |
Jeff King | 6315472 | 2008-06-26 23:59:50 -0400 | [diff] [blame] | 853 | r = s_update_ref("forced-update", ref, 1); |
Nguyễn Thái Ngọc Duy | d0b39a0 | 2016-06-26 07:58:07 +0200 | [diff] [blame] | 854 | format_display(display, r ? '!' : '+', quickref.buf, |
| 855 | r ? _("unable to update local ref") : _("forced update"), |
Junio C Hamano | 901f3d4 | 2016-10-21 15:22:55 -0700 | [diff] [blame] | 856 | remote, pretty_ref, summary_width); |
Jeff King | bd22d4f | 2015-09-24 17:07:40 -0400 | [diff] [blame] | 857 | strbuf_release(&quickref); |
Jeff King | 6315472 | 2008-06-26 23:59:50 -0400 | [diff] [blame] | 858 | return r; |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 859 | } else { |
Nguyễn Thái Ngọc Duy | d0b39a0 | 2016-06-26 07:58:07 +0200 | [diff] [blame] | 860 | format_display(display, '!', _("[rejected]"), _("non-fast-forward"), |
Junio C Hamano | 901f3d4 | 2016-10-21 15:22:55 -0700 | [diff] [blame] | 861 | remote, pretty_ref, summary_width); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 862 | return 1; |
| 863 | } |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 864 | } |
| 865 | |
brian m. carlson | 6ccac9e | 2017-10-15 22:06:54 +0000 | [diff] [blame] | 866 | static int iterate_ref_map(void *cb_data, struct object_id *oid) |
Junio C Hamano | 6b67e0d | 2011-09-01 15:43:35 -0700 | [diff] [blame] | 867 | { |
Junio C Hamano | f0e278b | 2011-09-02 16:22:47 -0700 | [diff] [blame] | 868 | struct ref **rm = cb_data; |
| 869 | struct ref *ref = *rm; |
Junio C Hamano | 6b67e0d | 2011-09-01 15:43:35 -0700 | [diff] [blame] | 870 | |
Nguyễn Thái Ngọc Duy | 4820a33 | 2013-12-05 20:02:40 +0700 | [diff] [blame] | 871 | while (ref && ref->status == REF_STATUS_REJECT_SHALLOW) |
| 872 | ref = ref->next; |
Junio C Hamano | f0e278b | 2011-09-02 16:22:47 -0700 | [diff] [blame] | 873 | if (!ref) |
| 874 | return -1; /* end of the list */ |
| 875 | *rm = ref->next; |
brian m. carlson | 6ccac9e | 2017-10-15 22:06:54 +0000 | [diff] [blame] | 876 | oidcpy(oid, &ref->old_oid); |
Junio C Hamano | f0e278b | 2011-09-02 16:22:47 -0700 | [diff] [blame] | 877 | return 0; |
Junio C Hamano | 6b67e0d | 2011-09-01 15:43:35 -0700 | [diff] [blame] | 878 | } |
| 879 | |
Jean-Noël Avila | 182f59d | 2019-08-06 19:19:52 +0200 | [diff] [blame] | 880 | static const char warn_show_forced_updates[] = |
| 881 | N_("Fetch normally indicates which branches had a forced update,\n" |
| 882 | "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" |
| 883 | "flag or run 'git config fetch.showForcedUpdates true'."); |
| 884 | static const char warn_time_show_forced_updates[] = |
| 885 | N_("It took %.2f seconds to check forced updates. You can use\n" |
| 886 | "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates false'\n" |
| 887 | " to avoid this check.\n"); |
| 888 | |
Andreas Ericsson | 47abd85 | 2009-04-17 10:20:11 +0200 | [diff] [blame] | 889 | static int store_updated_refs(const char *raw_url, const char *remote_name, |
Jonathan Tan | cf1e7c0 | 2018-07-02 15:08:43 -0700 | [diff] [blame] | 890 | int connectivity_checked, struct ref *ref_map) |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 891 | { |
| 892 | FILE *fp; |
| 893 | struct commit *commit; |
Tom Miller | 4b3b33a | 2014-01-02 20:28:51 -0600 | [diff] [blame] | 894 | int url_len, i, rc = 0; |
Jeff King | 5914f2d | 2011-12-08 03:43:19 -0500 | [diff] [blame] | 895 | struct strbuf note = STRBUF_INIT; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 896 | const char *what, *kind; |
| 897 | struct ref *rm; |
Nguyễn Thái Ngọc Duy | dcf6926 | 2014-11-30 15:24:27 +0700 | [diff] [blame] | 898 | char *url; |
Junio C Hamano | 887952b | 2020-08-18 14:25:22 +0000 | [diff] [blame] | 899 | const char *filename = (!write_fetch_head |
| 900 | ? "/dev/null" |
| 901 | : git_path_fetch_head(the_repository)); |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 902 | int want_status; |
Junio C Hamano | 11fd66d | 2016-10-21 15:28:07 -0700 | [diff] [blame] | 903 | int summary_width = transport_summary_width(ref_map); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 904 | |
André Goddard Rosa | d6617c7 | 2007-11-22 20:22:23 -0200 | [diff] [blame] | 905 | fp = fopen(filename, "a"); |
| 906 | if (!fp) |
Nguyễn Thái Ngọc Duy | 6da31d7 | 2016-05-08 16:47:26 +0700 | [diff] [blame] | 907 | return error_errno(_("cannot open %s"), filename); |
Andreas Ericsson | 47abd85 | 2009-04-17 10:20:11 +0200 | [diff] [blame] | 908 | |
Daniel Barkalow | fb0cc87 | 2009-11-18 02:42:22 +0100 | [diff] [blame] | 909 | if (raw_url) |
| 910 | url = transport_anonymize_url(raw_url); |
| 911 | else |
| 912 | url = xstrdup("foreign"); |
Junio C Hamano | 6b67e0d | 2011-09-01 15:43:35 -0700 | [diff] [blame] | 913 | |
Jonathan Tan | cf1e7c0 | 2018-07-02 15:08:43 -0700 | [diff] [blame] | 914 | if (!connectivity_checked) { |
Jonathan Tan | 2df1aa2 | 2020-01-11 20:15:25 -0800 | [diff] [blame] | 915 | struct check_connected_options opt = CHECK_CONNECTED_INIT; |
| 916 | |
Jonathan Tan | cf1e7c0 | 2018-07-02 15:08:43 -0700 | [diff] [blame] | 917 | rm = ref_map; |
Jonathan Tan | 2df1aa2 | 2020-01-11 20:15:25 -0800 | [diff] [blame] | 918 | if (check_connected(iterate_ref_map, &rm, &opt)) { |
Jonathan Tan | cf1e7c0 | 2018-07-02 15:08:43 -0700 | [diff] [blame] | 919 | rc = error(_("%s did not send all necessary objects\n"), url); |
| 920 | goto abort; |
| 921 | } |
Tay Ray Chuan | 9516a59 | 2011-10-07 15:40:22 +0800 | [diff] [blame] | 922 | } |
Junio C Hamano | 6b67e0d | 2011-09-01 15:43:35 -0700 | [diff] [blame] | 923 | |
Nguyễn Thái Ngọc Duy | 6bc91f2 | 2016-07-01 18:03:30 +0200 | [diff] [blame] | 924 | prepare_format_display(ref_map); |
| 925 | |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 926 | /* |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 927 | * We do a pass for each fetch_head_status type in their enum order, so |
| 928 | * merged entries are written before not-for-merge. That lets readers |
| 929 | * 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] | 930 | */ |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 931 | for (want_status = FETCH_HEAD_MERGE; |
| 932 | want_status <= FETCH_HEAD_IGNORE; |
| 933 | want_status++) { |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 934 | for (rm = ref_map; rm; rm = rm->next) { |
| 935 | struct ref *ref = NULL; |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 936 | const char *merge_status_marker = ""; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 937 | |
Nguyễn Thái Ngọc Duy | 4820a33 | 2013-12-05 20:02:40 +0700 | [diff] [blame] | 938 | if (rm->status == REF_STATUS_REJECT_SHALLOW) { |
| 939 | if (want_status == FETCH_HEAD_MERGE) |
| 940 | warning(_("reject %s because shallow roots are not allowed to be updated"), |
| 941 | rm->peer_ref ? rm->peer_ref->name : rm->name); |
| 942 | continue; |
| 943 | } |
| 944 | |
Stefan Beller | 21e1ee8 | 2018-06-28 18:21:57 -0700 | [diff] [blame] | 945 | commit = lookup_commit_reference_gently(the_repository, |
| 946 | &rm->old_oid, |
brian m. carlson | bc83266 | 2017-05-06 22:10:10 +0000 | [diff] [blame] | 947 | 1); |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 948 | if (!commit) |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 949 | rm->fetch_head_status = FETCH_HEAD_NOT_FOR_MERGE; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 950 | |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 951 | if (rm->fetch_head_status != want_status) |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 952 | continue; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 953 | |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 954 | if (rm->peer_ref) { |
Jeff King | 6f687c2 | 2015-09-24 17:08:09 -0400 | [diff] [blame] | 955 | ref = alloc_ref(rm->peer_ref->name); |
brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 +0000 | [diff] [blame] | 956 | oidcpy(&ref->old_oid, &rm->peer_ref->old_oid); |
| 957 | oidcpy(&ref->new_oid, &rm->old_oid); |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 958 | ref->force = rm->peer_ref->force; |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 959 | } |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 960 | |
Stefan Beller | be76c21 | 2018-12-06 13:26:55 -0800 | [diff] [blame] | 961 | if (recurse_submodules != RECURSE_SUBMODULES_OFF) |
| 962 | check_for_new_submodule_commits(&rm->old_oid); |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 963 | |
| 964 | if (!strcmp(rm->name, "HEAD")) { |
| 965 | kind = ""; |
| 966 | what = ""; |
| 967 | } |
René Scharfe | a6293f5 | 2019-11-26 12:18:26 +0100 | [diff] [blame] | 968 | else if (skip_prefix(rm->name, "refs/heads/", &what)) |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 969 | kind = "branch"; |
René Scharfe | a6293f5 | 2019-11-26 12:18:26 +0100 | [diff] [blame] | 970 | else if (skip_prefix(rm->name, "refs/tags/", &what)) |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 971 | kind = "tag"; |
René Scharfe | a6293f5 | 2019-11-26 12:18:26 +0100 | [diff] [blame] | 972 | else if (skip_prefix(rm->name, "refs/remotes/", &what)) |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 973 | kind = "remote-tracking branch"; |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 974 | else { |
| 975 | kind = ""; |
| 976 | what = rm->name; |
| 977 | } |
| 978 | |
| 979 | url_len = strlen(url); |
| 980 | for (i = url_len - 1; url[i] == '/' && 0 <= i; i--) |
| 981 | ; |
| 982 | url_len = i + 1; |
| 983 | if (4 < i && !strncmp(".git", url + i - 3, 4)) |
| 984 | url_len = i - 3; |
| 985 | |
| 986 | strbuf_reset(¬e); |
| 987 | if (*what) { |
| 988 | if (*kind) |
| 989 | strbuf_addf(¬e, "%s ", kind); |
| 990 | strbuf_addf(¬e, "'%s' of ", what); |
| 991 | } |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 992 | switch (rm->fetch_head_status) { |
| 993 | case FETCH_HEAD_NOT_FOR_MERGE: |
| 994 | merge_status_marker = "not-for-merge"; |
| 995 | /* fall-through */ |
| 996 | case FETCH_HEAD_MERGE: |
| 997 | fprintf(fp, "%s\t%s\t%s", |
brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 +0000 | [diff] [blame] | 998 | oid_to_hex(&rm->old_oid), |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 999 | merge_status_marker, |
| 1000 | note.buf); |
| 1001 | for (i = 0; i < url_len; ++i) |
| 1002 | if ('\n' == url[i]) |
| 1003 | fputs("\\n", fp); |
| 1004 | else |
| 1005 | fputc(url[i], fp); |
| 1006 | fputc('\n', fp); |
| 1007 | break; |
| 1008 | default: |
| 1009 | /* do not write anything to FETCH_HEAD */ |
| 1010 | break; |
| 1011 | } |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 1012 | |
| 1013 | strbuf_reset(¬e); |
| 1014 | if (ref) { |
Junio C Hamano | 901f3d4 | 2016-10-21 15:22:55 -0700 | [diff] [blame] | 1015 | rc |= update_local_ref(ref, what, rm, ¬e, |
| 1016 | summary_width); |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 1017 | free(ref); |
| 1018 | } else |
Nguyễn Thái Ngọc Duy | d0b39a0 | 2016-06-26 07:58:07 +0200 | [diff] [blame] | 1019 | format_display(¬e, '*', |
| 1020 | *kind ? kind : "branch", NULL, |
| 1021 | *what ? what : "HEAD", |
Junio C Hamano | 901f3d4 | 2016-10-21 15:22:55 -0700 | [diff] [blame] | 1022 | "FETCH_HEAD", summary_width); |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 1023 | if (note.len) { |
| 1024 | if (verbosity >= 0 && !shown_url) { |
| 1025 | fprintf(stderr, _("From %.*s\n"), |
| 1026 | url_len, url); |
| 1027 | shown_url = 1; |
| 1028 | } |
| 1029 | if (verbosity >= 0) |
| 1030 | fprintf(stderr, " %s\n", note.buf); |
| 1031 | } |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 1032 | } |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 1033 | } |
Tay Ray Chuan | 9516a59 | 2011-10-07 15:40:22 +0800 | [diff] [blame] | 1034 | |
Jeff King | fa25075 | 2009-05-25 06:40:54 -0400 | [diff] [blame] | 1035 | if (rc & STORE_REF_ERROR_DF_CONFLICT) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 1036 | error(_("some local refs could not be updated; try running\n" |
Jeff King | f3cb169 | 2008-06-27 00:01:41 -0400 | [diff] [blame] | 1037 | " 'git remote prune %s' to remove any old, conflicting " |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 1038 | "branches"), remote_name); |
Tay Ray Chuan | 9516a59 | 2011-10-07 15:40:22 +0800 | [diff] [blame] | 1039 | |
Derrick Stolee | 377444b | 2019-06-18 13:25:27 -0700 | [diff] [blame] | 1040 | if (advice_fetch_show_forced_updates) { |
| 1041 | if (!fetch_show_forced_updates) { |
Jean-Noël Avila | 182f59d | 2019-08-06 19:19:52 +0200 | [diff] [blame] | 1042 | warning(_(warn_show_forced_updates)); |
Derrick Stolee | 377444b | 2019-06-18 13:25:27 -0700 | [diff] [blame] | 1043 | } else if (forced_updates_ms > FORCED_UPDATES_DELAY_WARNING_IN_MS) { |
Jean-Noël Avila | 182f59d | 2019-08-06 19:19:52 +0200 | [diff] [blame] | 1044 | warning(_(warn_time_show_forced_updates), |
Derrick Stolee | 377444b | 2019-06-18 13:25:27 -0700 | [diff] [blame] | 1045 | forced_updates_ms / 1000.0); |
Derrick Stolee | 377444b | 2019-06-18 13:25:27 -0700 | [diff] [blame] | 1046 | } |
| 1047 | } |
| 1048 | |
Tay Ray Chuan | 9516a59 | 2011-10-07 15:40:22 +0800 | [diff] [blame] | 1049 | abort: |
Jeff King | 5914f2d | 2011-12-08 03:43:19 -0500 | [diff] [blame] | 1050 | strbuf_release(¬e); |
Tay Ray Chuan | 9516a59 | 2011-10-07 15:40:22 +0800 | [diff] [blame] | 1051 | free(url); |
| 1052 | fclose(fp); |
Dmitry V. Levin | efb98b4 | 2008-05-28 19:29:36 +0400 | [diff] [blame] | 1053 | return rc; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 1054 | } |
| 1055 | |
Shawn O. Pearce | 4191c35 | 2007-11-11 02:29:47 -0500 | [diff] [blame] | 1056 | /* |
| 1057 | * We would want to bypass the object transfer altogether if |
Johan Herland | d9eb020 | 2009-07-10 01:52:30 +0200 | [diff] [blame] | 1058 | * everything we are going to fetch already exists and is connected |
Shawn O. Pearce | 4191c35 | 2007-11-11 02:29:47 -0500 | [diff] [blame] | 1059 | * locally. |
Shawn O. Pearce | 4191c35 | 2007-11-11 02:29:47 -0500 | [diff] [blame] | 1060 | */ |
Jonathan Tan | 35f9e3e | 2018-09-21 11:22:38 -0700 | [diff] [blame] | 1061 | static int check_exist_and_connected(struct ref *ref_map) |
Shawn O. Pearce | 4191c35 | 2007-11-11 02:29:47 -0500 | [diff] [blame] | 1062 | { |
Junio C Hamano | f0e278b | 2011-09-02 16:22:47 -0700 | [diff] [blame] | 1063 | struct ref *rm = ref_map; |
Jeff King | 7043c70 | 2016-07-15 06:30:40 -0400 | [diff] [blame] | 1064 | struct check_connected_options opt = CHECK_CONNECTED_INIT; |
Jonathan Tan | 35f9e3e | 2018-09-21 11:22:38 -0700 | [diff] [blame] | 1065 | struct ref *r; |
Junio C Hamano | f0e278b | 2011-09-02 16:22:47 -0700 | [diff] [blame] | 1066 | |
Shawn O. Pearce | 4191c35 | 2007-11-11 02:29:47 -0500 | [diff] [blame] | 1067 | /* |
| 1068 | * If we are deepening a shallow clone we already have these |
| 1069 | * objects reachable. Running rev-list here will return with |
| 1070 | * a good (0) exit status and we'll bypass the fetch that we |
| 1071 | * really need to perform. Claiming failure now will ensure |
| 1072 | * we perform the network exchange to deepen our history. |
| 1073 | */ |
Nguyễn Thái Ngọc Duy | 508ea88 | 2016-06-12 17:53:59 +0700 | [diff] [blame] | 1074 | if (deepen) |
Shawn O. Pearce | 4191c35 | 2007-11-11 02:29:47 -0500 | [diff] [blame] | 1075 | return -1; |
Jonathan Tan | 35f9e3e | 2018-09-21 11:22:38 -0700 | [diff] [blame] | 1076 | |
| 1077 | /* |
| 1078 | * check_connected() allows objects to merely be promised, but |
| 1079 | * we need all direct targets to exist. |
| 1080 | */ |
| 1081 | for (r = rm; r; r = r->next) { |
Jonathan Tan | 6462d5e | 2019-11-05 10:56:19 -0800 | [diff] [blame] | 1082 | if (!has_object_file_with_flags(&r->old_oid, |
| 1083 | OBJECT_INFO_SKIP_FETCH_OBJECT)) |
Jonathan Tan | 35f9e3e | 2018-09-21 11:22:38 -0700 | [diff] [blame] | 1084 | return -1; |
| 1085 | } |
| 1086 | |
Jeff King | 7043c70 | 2016-07-15 06:30:40 -0400 | [diff] [blame] | 1087 | opt.quiet = 1; |
| 1088 | return check_connected(iterate_ref_map, &rm, &opt); |
Shawn O. Pearce | 4191c35 | 2007-11-11 02:29:47 -0500 | [diff] [blame] | 1089 | } |
| 1090 | |
Jonathan Tan | e2842b3 | 2018-08-01 13:13:20 -0700 | [diff] [blame] | 1091 | static int fetch_refs(struct transport *transport, struct ref *ref_map) |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 1092 | { |
Jonathan Tan | 35f9e3e | 2018-09-21 11:22:38 -0700 | [diff] [blame] | 1093 | int ret = check_exist_and_connected(ref_map); |
Josh Steadmon | 5fc3118 | 2019-10-02 16:49:28 -0700 | [diff] [blame] | 1094 | if (ret) { |
| 1095 | trace2_region_enter("fetch", "fetch_refs", the_repository); |
Jonathan Tan | e2842b3 | 2018-08-01 13:13:20 -0700 | [diff] [blame] | 1096 | ret = transport_fetch_refs(transport, ref_map); |
Josh Steadmon | 5fc3118 | 2019-10-02 16:49:28 -0700 | [diff] [blame] | 1097 | trace2_region_leave("fetch", "fetch_refs", the_repository); |
| 1098 | } |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 1099 | if (!ret) |
Brandon Williams | 05c4422 | 2018-06-27 15:30:20 -0700 | [diff] [blame] | 1100 | /* |
| 1101 | * Keep the new pack's ".keep" file around to allow the caller |
| 1102 | * time to update refs to reference the new objects. |
| 1103 | */ |
| 1104 | return 0; |
| 1105 | transport_unlock_pack(transport); |
| 1106 | return ret; |
| 1107 | } |
| 1108 | |
| 1109 | /* Update local refs based on the ref values fetched from a remote */ |
| 1110 | static int consume_refs(struct transport *transport, struct ref *ref_map) |
| 1111 | { |
Jonathan Tan | cf1e7c0 | 2018-07-02 15:08:43 -0700 | [diff] [blame] | 1112 | int connectivity_checked = transport->smart_options |
| 1113 | ? transport->smart_options->connectivity_checked : 0; |
Josh Steadmon | 5fc3118 | 2019-10-02 16:49:28 -0700 | [diff] [blame] | 1114 | int ret; |
| 1115 | trace2_region_enter("fetch", "consume_refs", the_repository); |
| 1116 | ret = store_updated_refs(transport->url, |
| 1117 | transport->remote->name, |
| 1118 | connectivity_checked, |
| 1119 | ref_map); |
Shawn O. Pearce | 1788c39 | 2007-09-14 03:31:23 -0400 | [diff] [blame] | 1120 | transport_unlock_pack(transport); |
Josh Steadmon | 5fc3118 | 2019-10-02 16:49:28 -0700 | [diff] [blame] | 1121 | trace2_region_leave("fetch", "consume_refs", the_repository); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 1122 | return ret; |
| 1123 | } |
| 1124 | |
Brandon Williams | def11e7 | 2018-05-16 15:58:09 -0700 | [diff] [blame] | 1125 | static int prune_refs(struct refspec *rs, struct ref *ref_map, |
| 1126 | const char *raw_url) |
Jay Soffian | f360d84 | 2009-11-10 09:15:47 +0100 | [diff] [blame] | 1127 | { |
Tom Miller | 4b3b33a | 2014-01-02 20:28:51 -0600 | [diff] [blame] | 1128 | int url_len, i, result = 0; |
Brandon Williams | a2ac50c | 2018-05-16 15:58:10 -0700 | [diff] [blame] | 1129 | struct ref *ref, *stale_refs = get_stale_heads(rs, ref_map); |
Tom Miller | 4b3b33a | 2014-01-02 20:28:51 -0600 | [diff] [blame] | 1130 | char *url; |
Junio C Hamano | 11fd66d | 2016-10-21 15:28:07 -0700 | [diff] [blame] | 1131 | int summary_width = transport_summary_width(stale_refs); |
Jay Soffian | f360d84 | 2009-11-10 09:15:47 +0100 | [diff] [blame] | 1132 | const char *dangling_msg = dry_run |
Nguyễn Thái Ngọc Duy | 18986d5 | 2012-04-23 19:30:25 +0700 | [diff] [blame] | 1133 | ? _(" (%s will become dangling)") |
| 1134 | : _(" (%s has become dangling)"); |
Jay Soffian | f360d84 | 2009-11-10 09:15:47 +0100 | [diff] [blame] | 1135 | |
Tom Miller | 4b3b33a | 2014-01-02 20:28:51 -0600 | [diff] [blame] | 1136 | if (raw_url) |
| 1137 | url = transport_anonymize_url(raw_url); |
| 1138 | else |
| 1139 | url = xstrdup("foreign"); |
| 1140 | |
| 1141 | url_len = strlen(url); |
| 1142 | for (i = url_len - 1; url[i] == '/' && 0 <= i; i--) |
| 1143 | ; |
| 1144 | |
| 1145 | url_len = i + 1; |
| 1146 | if (4 < i && !strncmp(".git", url + i - 3, 4)) |
| 1147 | url_len = i - 3; |
| 1148 | |
Michael Haggerty | a087b43 | 2015-06-22 16:02:59 +0200 | [diff] [blame] | 1149 | if (!dry_run) { |
| 1150 | struct string_list refnames = STRING_LIST_INIT_NODUP; |
| 1151 | |
| 1152 | for (ref = stale_refs; ref; ref = ref->next) |
| 1153 | string_list_append(&refnames, ref->name); |
| 1154 | |
Michael Haggerty | 64da419 | 2017-05-22 16:17:38 +0200 | [diff] [blame] | 1155 | result = delete_refs("fetch: prune", &refnames, 0); |
Michael Haggerty | a087b43 | 2015-06-22 16:02:59 +0200 | [diff] [blame] | 1156 | string_list_clear(&refnames, 0); |
| 1157 | } |
| 1158 | |
| 1159 | if (verbosity >= 0) { |
| 1160 | for (ref = stale_refs; ref; ref = ref->next) { |
Nguyễn Thái Ngọc Duy | d0b39a0 | 2016-06-26 07:58:07 +0200 | [diff] [blame] | 1161 | struct strbuf sb = STRBUF_INIT; |
Michael Haggerty | a087b43 | 2015-06-22 16:02:59 +0200 | [diff] [blame] | 1162 | if (!shown_url) { |
| 1163 | fprintf(stderr, _("From %.*s\n"), url_len, url); |
| 1164 | shown_url = 1; |
| 1165 | } |
Nguyễn Thái Ngọc Duy | 2cb040b | 2016-06-26 07:58:08 +0200 | [diff] [blame] | 1166 | format_display(&sb, '-', _("[deleted]"), NULL, |
Junio C Hamano | 901f3d4 | 2016-10-21 15:22:55 -0700 | [diff] [blame] | 1167 | _("(none)"), prettify_refname(ref->name), |
| 1168 | summary_width); |
Nguyễn Thái Ngọc Duy | d0b39a0 | 2016-06-26 07:58:07 +0200 | [diff] [blame] | 1169 | fprintf(stderr, " %s\n",sb.buf); |
| 1170 | strbuf_release(&sb); |
Jay Soffian | f360d84 | 2009-11-10 09:15:47 +0100 | [diff] [blame] | 1171 | warn_dangling_symref(stderr, dangling_msg, ref->name); |
| 1172 | } |
| 1173 | } |
Michael Haggerty | a087b43 | 2015-06-22 16:02:59 +0200 | [diff] [blame] | 1174 | |
Tom Miller | 4b3b33a | 2014-01-02 20:28:51 -0600 | [diff] [blame] | 1175 | free(url); |
Jay Soffian | f360d84 | 2009-11-10 09:15:47 +0100 | [diff] [blame] | 1176 | free_refs(stale_refs); |
| 1177 | return result; |
| 1178 | } |
| 1179 | |
Johannes Schindelin | 8ee5d73 | 2008-10-13 11:36:52 +0200 | [diff] [blame] | 1180 | static void check_not_current_branch(struct ref *ref_map) |
| 1181 | { |
| 1182 | struct branch *current_branch = branch_get(NULL); |
| 1183 | |
| 1184 | if (is_bare_repository() || !current_branch) |
| 1185 | return; |
| 1186 | |
| 1187 | for (; ref_map; ref_map = ref_map->next) |
| 1188 | if (ref_map->peer_ref && !strcmp(current_branch->refname, |
| 1189 | ref_map->peer_ref->name)) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 1190 | die(_("Refusing to fetch into current branch %s " |
| 1191 | "of non-bare repository"), current_branch->refname); |
Johannes Schindelin | 8ee5d73 | 2008-10-13 11:36:52 +0200 | [diff] [blame] | 1192 | } |
| 1193 | |
Junio C Hamano | e6cc510 | 2010-02-24 11:02:05 -0800 | [diff] [blame] | 1194 | static int truncate_fetch_head(void) |
| 1195 | { |
Stefan Beller | 102de88 | 2018-05-17 15:51:51 -0700 | [diff] [blame] | 1196 | const char *filename = git_path_fetch_head(the_repository); |
Johannes Schindelin | ea56518 | 2016-01-11 19:35:54 +0100 | [diff] [blame] | 1197 | FILE *fp = fopen_for_writing(filename); |
Junio C Hamano | e6cc510 | 2010-02-24 11:02:05 -0800 | [diff] [blame] | 1198 | |
| 1199 | if (!fp) |
Nguyễn Thái Ngọc Duy | 6da31d7 | 2016-05-08 16:47:26 +0700 | [diff] [blame] | 1200 | return error_errno(_("cannot open %s"), filename); |
Junio C Hamano | e6cc510 | 2010-02-24 11:02:05 -0800 | [diff] [blame] | 1201 | fclose(fp); |
| 1202 | return 0; |
| 1203 | } |
| 1204 | |
Junio C Hamano | db5723c | 2013-08-07 14:43:20 -0700 | [diff] [blame] | 1205 | static void set_option(struct transport *transport, const char *name, const char *value) |
| 1206 | { |
| 1207 | int r = transport_set_option(transport, name, value); |
| 1208 | if (r < 0) |
| 1209 | die(_("Option \"%s\" value \"%s\" is not valid for %s"), |
| 1210 | name, value, transport->url); |
| 1211 | if (r > 0) |
| 1212 | warning(_("Option \"%s\" is ignored for %s\n"), |
| 1213 | name, transport->url); |
| 1214 | } |
| 1215 | |
Jonathan Tan | 3390e42 | 2018-07-02 15:39:44 -0700 | [diff] [blame] | 1216 | |
| 1217 | static int add_oid(const char *refname, const struct object_id *oid, int flags, |
| 1218 | void *cb_data) |
| 1219 | { |
| 1220 | struct oid_array *oids = cb_data; |
| 1221 | |
| 1222 | oid_array_append(oids, oid); |
| 1223 | return 0; |
| 1224 | } |
| 1225 | |
| 1226 | static void add_negotiation_tips(struct git_transport_options *smart_options) |
| 1227 | { |
| 1228 | struct oid_array *oids = xcalloc(1, sizeof(*oids)); |
| 1229 | int i; |
| 1230 | |
| 1231 | for (i = 0; i < negotiation_tip.nr; i++) { |
| 1232 | const char *s = negotiation_tip.items[i].string; |
| 1233 | int old_nr; |
| 1234 | if (!has_glob_specials(s)) { |
| 1235 | struct object_id oid; |
| 1236 | if (get_oid(s, &oid)) |
| 1237 | die("%s is not a valid object", s); |
| 1238 | oid_array_append(oids, &oid); |
| 1239 | continue; |
| 1240 | } |
| 1241 | old_nr = oids->nr; |
| 1242 | for_each_glob_ref(add_oid, s, oids); |
| 1243 | if (old_nr == oids->nr) |
| 1244 | warning("Ignoring --negotiation-tip=%s because it does not match any refs", |
| 1245 | s); |
| 1246 | } |
| 1247 | smart_options->negotiation_tips = oids; |
| 1248 | } |
| 1249 | |
Nguyễn Thái Ngọc Duy | 508ea88 | 2016-06-12 17:53:59 +0700 | [diff] [blame] | 1250 | static struct transport *prepare_transport(struct remote *remote, int deepen) |
Junio C Hamano | db5723c | 2013-08-07 14:43:20 -0700 | [diff] [blame] | 1251 | { |
| 1252 | struct transport *transport; |
Josh Steadmon | 87c2d9d | 2019-01-07 16:17:09 -0800 | [diff] [blame] | 1253 | |
Junio C Hamano | db5723c | 2013-08-07 14:43:20 -0700 | [diff] [blame] | 1254 | transport = transport_get(remote, NULL); |
| 1255 | transport_set_verbosity(transport, verbosity, progress); |
Eric Wong | c915f11 | 2016-02-03 04:09:14 +0000 | [diff] [blame] | 1256 | transport->family = family; |
Junio C Hamano | db5723c | 2013-08-07 14:43:20 -0700 | [diff] [blame] | 1257 | if (upload_pack) |
| 1258 | set_option(transport, TRANS_OPT_UPLOADPACK, upload_pack); |
| 1259 | if (keep) |
| 1260 | set_option(transport, TRANS_OPT_KEEP, "yes"); |
| 1261 | if (depth) |
| 1262 | set_option(transport, TRANS_OPT_DEPTH, depth); |
Nguyễn Thái Ngọc Duy | 508ea88 | 2016-06-12 17:53:59 +0700 | [diff] [blame] | 1263 | if (deepen && deepen_since) |
| 1264 | set_option(transport, TRANS_OPT_DEEPEN_SINCE, deepen_since); |
Nguyễn Thái Ngọc Duy | a45a260 | 2016-06-12 17:54:04 +0700 | [diff] [blame] | 1265 | if (deepen && deepen_not.nr) |
| 1266 | set_option(transport, TRANS_OPT_DEEPEN_NOT, |
| 1267 | (const char *)&deepen_not); |
Nguyễn Thái Ngọc Duy | cccf74e | 2016-06-12 17:54:09 +0700 | [diff] [blame] | 1268 | if (deepen_relative) |
| 1269 | set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, "yes"); |
Nguyễn Thái Ngọc Duy | 48d25ca | 2013-12-05 20:02:42 +0700 | [diff] [blame] | 1270 | if (update_shallow) |
| 1271 | set_option(transport, TRANS_OPT_UPDATE_SHALLOW, "yes"); |
Jeff Hostetler | acb0c57 | 2017-12-08 15:58:44 +0000 | [diff] [blame] | 1272 | if (filter_options.choice) { |
Matthew DeVore | cf9ceb5 | 2019-06-27 15:54:10 -0700 | [diff] [blame] | 1273 | const char *spec = |
| 1274 | expand_list_objects_filter_spec(&filter_options); |
| 1275 | set_option(transport, TRANS_OPT_LIST_OBJECTS_FILTER, spec); |
Jeff Hostetler | acb0c57 | 2017-12-08 15:58:44 +0000 | [diff] [blame] | 1276 | set_option(transport, TRANS_OPT_FROM_PROMISOR, "1"); |
| 1277 | } |
Jonathan Tan | 3390e42 | 2018-07-02 15:39:44 -0700 | [diff] [blame] | 1278 | if (negotiation_tip.nr) { |
| 1279 | if (transport->smart_options) |
| 1280 | add_negotiation_tips(transport->smart_options); |
| 1281 | else |
| 1282 | warning("Ignoring --negotiation-tip because the protocol does not support it."); |
| 1283 | } |
Junio C Hamano | db5723c | 2013-08-07 14:43:20 -0700 | [diff] [blame] | 1284 | return transport; |
| 1285 | } |
| 1286 | |
Junio C Hamano | 069d503 | 2013-08-07 15:14:45 -0700 | [diff] [blame] | 1287 | static void backfill_tags(struct transport *transport, struct ref *ref_map) |
| 1288 | { |
Nguyễn Thái Ngọc Duy | 508ea88 | 2016-06-12 17:53:59 +0700 | [diff] [blame] | 1289 | int cannot_reuse; |
| 1290 | |
| 1291 | /* |
| 1292 | * Once we have set TRANS_OPT_DEEPEN_SINCE, we can't unset it |
| 1293 | * when remote helper is used (setting it to an empty string |
| 1294 | * is not unsetting). We could extend the remote helper |
| 1295 | * protocol for that, but for now, just force a new connection |
Nguyễn Thái Ngọc Duy | a45a260 | 2016-06-12 17:54:04 +0700 | [diff] [blame] | 1296 | * without deepen-since. Similar story for deepen-not. |
Nguyễn Thái Ngọc Duy | 508ea88 | 2016-06-12 17:53:59 +0700 | [diff] [blame] | 1297 | */ |
Nguyễn Thái Ngọc Duy | a45a260 | 2016-06-12 17:54:04 +0700 | [diff] [blame] | 1298 | cannot_reuse = transport->cannot_reuse || |
| 1299 | deepen_since || deepen_not.nr; |
Nguyễn Thái Ngọc Duy | 508ea88 | 2016-06-12 17:53:59 +0700 | [diff] [blame] | 1300 | if (cannot_reuse) { |
| 1301 | gsecondary = prepare_transport(transport->remote, 0); |
Junio C Hamano | b26ed43 | 2013-08-07 15:47:18 -0700 | [diff] [blame] | 1302 | transport = gsecondary; |
| 1303 | } |
| 1304 | |
Junio C Hamano | 069d503 | 2013-08-07 15:14:45 -0700 | [diff] [blame] | 1305 | transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL); |
| 1306 | transport_set_option(transport, TRANS_OPT_DEPTH, "0"); |
Nguyễn Thái Ngọc Duy | cccf74e | 2016-06-12 17:54:09 +0700 | [diff] [blame] | 1307 | transport_set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, NULL); |
Jonathan Tan | e2842b3 | 2018-08-01 13:13:20 -0700 | [diff] [blame] | 1308 | if (!fetch_refs(transport, ref_map)) |
Brandon Williams | 05c4422 | 2018-06-27 15:30:20 -0700 | [diff] [blame] | 1309 | consume_refs(transport, ref_map); |
Junio C Hamano | b26ed43 | 2013-08-07 15:47:18 -0700 | [diff] [blame] | 1310 | |
| 1311 | if (gsecondary) { |
| 1312 | transport_disconnect(gsecondary); |
| 1313 | gsecondary = NULL; |
| 1314 | } |
Junio C Hamano | 069d503 | 2013-08-07 15:14:45 -0700 | [diff] [blame] | 1315 | } |
| 1316 | |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 1317 | static int do_fetch(struct transport *transport, |
Brandon Williams | 65a1301 | 2018-05-16 15:58:07 -0700 | [diff] [blame] | 1318 | struct refspec *rs) |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 1319 | { |
Shawn O. Pearce | 7f98428 | 2008-03-02 21:34:43 -0500 | [diff] [blame] | 1320 | struct ref *ref_map; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 1321 | int autotags = (transport->remote->fetch_tags == 1); |
Michael Haggerty | 5b87d8d | 2013-05-25 11:08:16 +0200 | [diff] [blame] | 1322 | int retcode = 0; |
Brandon Williams | 6d1700d | 2018-06-27 15:30:21 -0700 | [diff] [blame] | 1323 | const struct ref *remote_refs; |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1324 | struct strvec ref_prefixes = STRVEC_INIT; |
Jonathan Tan | e70a303 | 2018-09-27 12:24:07 -0700 | [diff] [blame] | 1325 | int must_list_refs = 1; |
Julian Phillips | b1a01e1 | 2009-10-25 21:28:12 +0000 | [diff] [blame] | 1326 | |
Daniel Johnson | ed36854 | 2010-08-11 18:57:20 -0400 | [diff] [blame] | 1327 | if (tags == TAGS_DEFAULT) { |
| 1328 | if (transport->remote->fetch_tags == 2) |
| 1329 | tags = TAGS_SET; |
| 1330 | if (transport->remote->fetch_tags == -1) |
| 1331 | tags = TAGS_UNSET; |
| 1332 | } |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 1333 | |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 1334 | /* if not appending, truncate FETCH_HEAD */ |
Junio C Hamano | 887952b | 2020-08-18 14:25:22 +0000 | [diff] [blame] | 1335 | if (!append && write_fetch_head) { |
Michael Haggerty | 5b87d8d | 2013-05-25 11:08:16 +0200 | [diff] [blame] | 1336 | retcode = truncate_fetch_head(); |
| 1337 | if (retcode) |
| 1338 | goto cleanup; |
André Goddard Rosa | d6617c7 | 2007-11-22 20:22:23 -0200 | [diff] [blame] | 1339 | } |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 1340 | |
Jonathan Tan | e70a303 | 2018-09-27 12:24:07 -0700 | [diff] [blame] | 1341 | if (rs->nr) { |
| 1342 | int i; |
| 1343 | |
Brandon Williams | 6d1700d | 2018-06-27 15:30:21 -0700 | [diff] [blame] | 1344 | refspec_ref_prefixes(rs, &ref_prefixes); |
Jonathan Tan | e70a303 | 2018-09-27 12:24:07 -0700 | [diff] [blame] | 1345 | |
| 1346 | /* |
| 1347 | * We can avoid listing refs if all of them are exact |
| 1348 | * OIDs |
| 1349 | */ |
| 1350 | must_list_refs = 0; |
| 1351 | for (i = 0; i < rs->nr; i++) { |
| 1352 | if (!rs->items[i].exact_sha1) { |
| 1353 | must_list_refs = 1; |
| 1354 | break; |
| 1355 | } |
| 1356 | } |
| 1357 | } else if (transport->remote && transport->remote->fetch.nr) |
Brandon Williams | 6d1700d | 2018-06-27 15:30:21 -0700 | [diff] [blame] | 1358 | refspec_ref_prefixes(&transport->remote->fetch, &ref_prefixes); |
| 1359 | |
Jonathan Tan | e70a303 | 2018-09-27 12:24:07 -0700 | [diff] [blame] | 1360 | if (tags == TAGS_SET || tags == TAGS_DEFAULT) { |
| 1361 | must_list_refs = 1; |
Jeff King | d70a9eb | 2020-07-28 20:37:20 -0400 | [diff] [blame] | 1362 | if (ref_prefixes.nr) |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1363 | strvec_push(&ref_prefixes, "refs/tags/"); |
Brandon Williams | 6d1700d | 2018-06-27 15:30:21 -0700 | [diff] [blame] | 1364 | } |
| 1365 | |
Josh Steadmon | 5fc3118 | 2019-10-02 16:49:28 -0700 | [diff] [blame] | 1366 | if (must_list_refs) { |
| 1367 | trace2_region_enter("fetch", "remote_refs", the_repository); |
Jonathan Tan | e70a303 | 2018-09-27 12:24:07 -0700 | [diff] [blame] | 1368 | remote_refs = transport_get_remote_refs(transport, &ref_prefixes); |
Josh Steadmon | 5fc3118 | 2019-10-02 16:49:28 -0700 | [diff] [blame] | 1369 | trace2_region_leave("fetch", "remote_refs", the_repository); |
| 1370 | } else |
Jonathan Tan | e70a303 | 2018-09-27 12:24:07 -0700 | [diff] [blame] | 1371 | remote_refs = NULL; |
| 1372 | |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1373 | strvec_clear(&ref_prefixes); |
Brandon Williams | 6d1700d | 2018-06-27 15:30:21 -0700 | [diff] [blame] | 1374 | |
| 1375 | ref_map = get_ref_map(transport->remote, remote_refs, rs, |
| 1376 | tags, &autotags); |
Johannes Schindelin | 8ee5d73 | 2008-10-13 11:36:52 +0200 | [diff] [blame] | 1377 | if (!update_head_ok) |
| 1378 | check_not_current_branch(ref_map); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 1379 | |
Shawn O. Pearce | 41fa7d2 | 2008-03-03 22:27:40 -0500 | [diff] [blame] | 1380 | if (tags == TAGS_DEFAULT && autotags) |
| 1381 | transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1"); |
Carlos Martín Nieto | ed43de6 | 2011-10-15 07:04:25 +0200 | [diff] [blame] | 1382 | if (prune) { |
Michael Haggerty | 0838bf4 | 2013-10-30 06:33:00 +0100 | [diff] [blame] | 1383 | /* |
| 1384 | * We only prune based on refspecs specified |
| 1385 | * explicitly (via command line or configuration); we |
| 1386 | * don't care whether --tags was specified. |
| 1387 | */ |
Brandon Williams | 65a1301 | 2018-05-16 15:58:07 -0700 | [diff] [blame] | 1388 | if (rs->nr) { |
Brandon Williams | def11e7 | 2018-05-16 15:58:09 -0700 | [diff] [blame] | 1389 | prune_refs(rs, ref_map, transport->url); |
Michael Haggerty | c5a84e9 | 2013-10-30 06:32:59 +0100 | [diff] [blame] | 1390 | } else { |
Brandon Williams | def11e7 | 2018-05-16 15:58:09 -0700 | [diff] [blame] | 1391 | prune_refs(&transport->remote->fetch, |
Tom Miller | 4b3b33a | 2014-01-02 20:28:51 -0600 | [diff] [blame] | 1392 | ref_map, |
| 1393 | transport->url); |
Carlos Martín Nieto | e8c1e6c | 2011-10-15 07:04:26 +0200 | [diff] [blame] | 1394 | } |
Carlos Martín Nieto | ed43de6 | 2011-10-15 07:04:25 +0200 | [diff] [blame] | 1395 | } |
Jonathan Tan | e2842b3 | 2018-08-01 13:13:20 -0700 | [diff] [blame] | 1396 | if (fetch_refs(transport, ref_map) || consume_refs(transport, ref_map)) { |
Tom Miller | 10a6cc8 | 2014-01-02 20:28:52 -0600 | [diff] [blame] | 1397 | free_refs(ref_map); |
| 1398 | retcode = 1; |
| 1399 | goto cleanup; |
| 1400 | } |
Corentin BOMPARD | 24bc1a1 | 2019-08-19 11:11:20 +0200 | [diff] [blame] | 1401 | |
| 1402 | if (set_upstream) { |
| 1403 | struct branch *branch = branch_get("HEAD"); |
| 1404 | struct ref *rm; |
| 1405 | struct ref *source_ref = NULL; |
| 1406 | |
| 1407 | /* |
| 1408 | * We're setting the upstream configuration for the |
Elijah Newren | 15beaaa | 2019-11-05 17:07:23 +0000 | [diff] [blame] | 1409 | * current branch. The relevant upstream is the |
Corentin BOMPARD | 24bc1a1 | 2019-08-19 11:11:20 +0200 | [diff] [blame] | 1410 | * fetched branch that is meant to be merged with the |
| 1411 | * current one, i.e. the one fetched to FETCH_HEAD. |
| 1412 | * |
| 1413 | * When there are several such branches, consider the |
| 1414 | * request ambiguous and err on the safe side by doing |
| 1415 | * nothing and just emit a warning. |
| 1416 | */ |
| 1417 | for (rm = ref_map; rm; rm = rm->next) { |
| 1418 | if (!rm->peer_ref) { |
| 1419 | if (source_ref) { |
Ralf Thielow | 391c7e4 | 2019-10-31 20:41:46 +0000 | [diff] [blame] | 1420 | warning(_("multiple branches detected, incompatible with --set-upstream")); |
Corentin BOMPARD | 24bc1a1 | 2019-08-19 11:11:20 +0200 | [diff] [blame] | 1421 | goto skip; |
| 1422 | } else { |
| 1423 | source_ref = rm; |
| 1424 | } |
| 1425 | } |
| 1426 | } |
| 1427 | if (source_ref) { |
| 1428 | if (!strcmp(source_ref->name, "HEAD") || |
| 1429 | starts_with(source_ref->name, "refs/heads/")) |
| 1430 | install_branch_config(0, |
| 1431 | branch->name, |
| 1432 | transport->remote->name, |
| 1433 | source_ref->name); |
| 1434 | else if (starts_with(source_ref->name, "refs/remotes/")) |
| 1435 | warning(_("not setting upstream for a remote remote-tracking branch")); |
| 1436 | else if (starts_with(source_ref->name, "refs/tags/")) |
| 1437 | warning(_("not setting upstream for a remote tag")); |
| 1438 | else |
| 1439 | warning(_("unknown branch type")); |
| 1440 | } else { |
| 1441 | warning(_("no source branch found.\n" |
| 1442 | "you need to specify exactly one branch with the --set-upstream option.")); |
| 1443 | } |
| 1444 | } |
| 1445 | skip: |
Shawn O. Pearce | 7f98428 | 2008-03-02 21:34:43 -0500 | [diff] [blame] | 1446 | free_refs(ref_map); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 1447 | |
| 1448 | /* if neither --no-tags nor --tags was specified, do automated tag |
| 1449 | * following ... */ |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 1450 | if (tags == TAGS_DEFAULT && autotags) { |
Shawn O. Pearce | c50b2b4 | 2008-03-02 21:35:00 -0500 | [diff] [blame] | 1451 | struct ref **tail = &ref_map; |
| 1452 | ref_map = NULL; |
Brandon Williams | 6d1700d | 2018-06-27 15:30:21 -0700 | [diff] [blame] | 1453 | find_non_local_tags(remote_refs, &ref_map, &tail); |
Junio C Hamano | 069d503 | 2013-08-07 15:14:45 -0700 | [diff] [blame] | 1454 | if (ref_map) |
| 1455 | backfill_tags(transport, ref_map); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 1456 | free_refs(ref_map); |
| 1457 | } |
| 1458 | |
Michael Haggerty | 5b87d8d | 2013-05-25 11:08:16 +0200 | [diff] [blame] | 1459 | cleanup: |
Michael Haggerty | 5b87d8d | 2013-05-25 11:08:16 +0200 | [diff] [blame] | 1460 | return retcode; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 1461 | } |
| 1462 | |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1463 | static int get_one_remote_for_fetch(struct remote *remote, void *priv) |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 1464 | { |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1465 | struct string_list *list = priv; |
Björn Gustavsson | 7cc91a2 | 2009-11-09 21:11:06 +0100 | [diff] [blame] | 1466 | if (!remote->skip_default_update) |
Julian Phillips | 1d2f80f | 2010-06-26 00:41:38 +0100 | [diff] [blame] | 1467 | string_list_append(list, remote->name); |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1468 | return 0; |
| 1469 | } |
| 1470 | |
| 1471 | struct remote_group_data { |
| 1472 | const char *name; |
| 1473 | struct string_list *list; |
| 1474 | }; |
| 1475 | |
| 1476 | static int get_remote_group(const char *key, const char *value, void *priv) |
| 1477 | { |
| 1478 | struct remote_group_data *g = priv; |
| 1479 | |
Michael Haggerty | bc598c3 | 2015-07-28 23:08:21 +0200 | [diff] [blame] | 1480 | if (skip_prefix(key, "remotes.", &key) && !strcmp(key, g->name)) { |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1481 | /* split list by white space */ |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1482 | while (*value) { |
Michael Haggerty | 5f65499 | 2015-07-28 23:08:20 +0200 | [diff] [blame] | 1483 | size_t wordlen = strcspn(value, " \t\n"); |
| 1484 | |
Michael Haggerty | e286542 | 2015-07-28 23:08:19 +0200 | [diff] [blame] | 1485 | if (wordlen >= 1) |
Keith McGuigan | b7410f6 | 2016-06-14 14:28:56 -0400 | [diff] [blame] | 1486 | string_list_append_nodup(g->list, |
Michael Haggerty | e286542 | 2015-07-28 23:08:19 +0200 | [diff] [blame] | 1487 | xstrndup(value, wordlen)); |
| 1488 | value += wordlen + (value[wordlen] != '\0'); |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1489 | } |
| 1490 | } |
| 1491 | |
| 1492 | return 0; |
| 1493 | } |
| 1494 | |
| 1495 | static int add_remote_or_group(const char *name, struct string_list *list) |
| 1496 | { |
| 1497 | int prev_nr = list->nr; |
Gary V. Vaughan | 66dbfd5 | 2010-05-14 09:31:33 +0000 | [diff] [blame] | 1498 | struct remote_group_data g; |
| 1499 | g.name = name; g.list = list; |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1500 | |
| 1501 | git_config(get_remote_group, &g); |
| 1502 | if (list->nr == prev_nr) { |
Thomas Gummerer | 674468b | 2016-02-16 10:47:50 +0100 | [diff] [blame] | 1503 | struct remote *remote = remote_get(name); |
Johannes Schindelin | e459b07 | 2017-01-19 22:20:02 +0100 | [diff] [blame] | 1504 | if (!remote_is_configured(remote, 0)) |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1505 | return 0; |
Julian Phillips | 1d2f80f | 2010-06-26 00:41:38 +0100 | [diff] [blame] | 1506 | string_list_append(list, remote->name); |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1507 | } |
| 1508 | return 1; |
| 1509 | } |
| 1510 | |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1511 | static void add_options_to_argv(struct strvec *argv) |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 1512 | { |
| 1513 | if (dry_run) |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1514 | strvec_push(argv, "--dry-run"); |
Michael Haggerty | 90765fa | 2013-10-30 06:33:04 +0100 | [diff] [blame] | 1515 | if (prune != -1) |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1516 | strvec_push(argv, prune ? "--prune" : "--no-prune"); |
Ævar Arnfjörð Bjarmason | 97716d2 | 2018-02-09 20:32:15 +0000 | [diff] [blame] | 1517 | if (prune_tags != -1) |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1518 | strvec_push(argv, prune_tags ? "--prune-tags" : "--no-prune-tags"); |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 1519 | if (update_head_ok) |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1520 | strvec_push(argv, "--update-head-ok"); |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 1521 | if (force) |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1522 | strvec_push(argv, "--force"); |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 1523 | if (keep) |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1524 | strvec_push(argv, "--keep"); |
Jens Lehmann | be254a0 | 2010-11-11 00:55:02 +0100 | [diff] [blame] | 1525 | if (recurse_submodules == RECURSE_SUBMODULES_ON) |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1526 | strvec_push(argv, "--recurse-submodules"); |
Jens Lehmann | 8f0700d | 2011-03-06 23:11:21 +0100 | [diff] [blame] | 1527 | else if (recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND) |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1528 | strvec_push(argv, "--recurse-submodules=on-demand"); |
Dan Johnson | 8556646 | 2012-09-05 17:22:19 -0400 | [diff] [blame] | 1529 | if (tags == TAGS_SET) |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1530 | strvec_push(argv, "--tags"); |
Dan Johnson | 8556646 | 2012-09-05 17:22:19 -0400 | [diff] [blame] | 1531 | else if (tags == TAGS_UNSET) |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1532 | strvec_push(argv, "--no-tags"); |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 1533 | if (verbosity >= 2) |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1534 | strvec_push(argv, "-v"); |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 1535 | if (verbosity >= 1) |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1536 | strvec_push(argv, "-v"); |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 1537 | else if (verbosity < 0) |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1538 | strvec_push(argv, "-q"); |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 1539 | |
| 1540 | } |
| 1541 | |
Johannes Schindelin | d54dea7 | 2019-10-05 11:46:40 -0700 | [diff] [blame] | 1542 | /* Fetch multiple remotes in parallel */ |
| 1543 | |
| 1544 | struct parallel_fetch_state { |
| 1545 | const char **argv; |
| 1546 | struct string_list *remotes; |
| 1547 | int next, result; |
| 1548 | }; |
| 1549 | |
| 1550 | static int fetch_next_remote(struct child_process *cp, struct strbuf *out, |
| 1551 | void *cb, void **task_cb) |
| 1552 | { |
| 1553 | struct parallel_fetch_state *state = cb; |
| 1554 | char *remote; |
| 1555 | |
| 1556 | if (state->next < 0 || state->next >= state->remotes->nr) |
| 1557 | return 0; |
| 1558 | |
| 1559 | remote = state->remotes->items[state->next++].string; |
| 1560 | *task_cb = remote; |
| 1561 | |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1562 | strvec_pushv(&cp->args, state->argv); |
| 1563 | strvec_push(&cp->args, remote); |
Johannes Schindelin | d54dea7 | 2019-10-05 11:46:40 -0700 | [diff] [blame] | 1564 | cp->git_cmd = 1; |
| 1565 | |
| 1566 | if (verbosity >= 0) |
| 1567 | printf(_("Fetching %s\n"), remote); |
| 1568 | |
| 1569 | return 1; |
| 1570 | } |
| 1571 | |
| 1572 | static int fetch_failed_to_start(struct strbuf *out, void *cb, void *task_cb) |
| 1573 | { |
| 1574 | struct parallel_fetch_state *state = cb; |
| 1575 | const char *remote = task_cb; |
| 1576 | |
| 1577 | state->result = error(_("Could not fetch %s"), remote); |
| 1578 | |
| 1579 | return 0; |
| 1580 | } |
| 1581 | |
| 1582 | static int fetch_finished(int result, struct strbuf *out, |
| 1583 | void *cb, void *task_cb) |
| 1584 | { |
| 1585 | struct parallel_fetch_state *state = cb; |
| 1586 | const char *remote = task_cb; |
| 1587 | |
| 1588 | if (result) { |
| 1589 | strbuf_addf(out, _("could not fetch '%s' (exit code: %d)\n"), |
| 1590 | remote, result); |
| 1591 | state->result = -1; |
| 1592 | } |
| 1593 | |
| 1594 | return 0; |
| 1595 | } |
| 1596 | |
| 1597 | static int fetch_multiple(struct string_list *list, int max_children) |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1598 | { |
| 1599 | int i, result = 0; |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1600 | struct strvec argv = STRVEC_INIT; |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1601 | |
Junio C Hamano | 887952b | 2020-08-18 14:25:22 +0000 | [diff] [blame] | 1602 | if (!append && write_fetch_head) { |
Junio C Hamano | e6cc510 | 2010-02-24 11:02:05 -0800 | [diff] [blame] | 1603 | int errcode = truncate_fetch_head(); |
| 1604 | if (errcode) |
| 1605 | return errcode; |
| 1606 | } |
| 1607 | |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1608 | strvec_pushl(&argv, "fetch", "--append", "--no-auto-gc", |
Jeff King | f6d8942 | 2020-07-28 16:26:31 -0400 | [diff] [blame] | 1609 | "--no-write-commit-graph", NULL); |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 1610 | add_options_to_argv(&argv); |
| 1611 | |
Johannes Schindelin | d54dea7 | 2019-10-05 11:46:40 -0700 | [diff] [blame] | 1612 | if (max_children != 1 && list->nr != 1) { |
Jeff King | d70a9eb | 2020-07-28 20:37:20 -0400 | [diff] [blame] | 1613 | struct parallel_fetch_state state = { argv.v, list, 0, 0 }; |
Johannes Schindelin | d54dea7 | 2019-10-05 11:46:40 -0700 | [diff] [blame] | 1614 | |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1615 | strvec_push(&argv, "--end-of-options"); |
Johannes Schindelin | d54dea7 | 2019-10-05 11:46:40 -0700 | [diff] [blame] | 1616 | result = run_processes_parallel_tr2(max_children, |
| 1617 | &fetch_next_remote, |
| 1618 | &fetch_failed_to_start, |
| 1619 | &fetch_finished, |
| 1620 | &state, |
| 1621 | "fetch", "parallel/fetch"); |
| 1622 | |
| 1623 | if (!result) |
| 1624 | result = state.result; |
| 1625 | } else |
| 1626 | for (i = 0; i < list->nr; i++) { |
| 1627 | const char *name = list->items[i].string; |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1628 | strvec_push(&argv, name); |
Johannes Schindelin | d54dea7 | 2019-10-05 11:46:40 -0700 | [diff] [blame] | 1629 | if (verbosity >= 0) |
| 1630 | printf(_("Fetching %s\n"), name); |
Jeff King | d70a9eb | 2020-07-28 20:37:20 -0400 | [diff] [blame] | 1631 | if (run_command_v_opt(argv.v, RUN_GIT_CMD)) { |
Johannes Schindelin | d54dea7 | 2019-10-05 11:46:40 -0700 | [diff] [blame] | 1632 | error(_("Could not fetch %s"), name); |
| 1633 | result = 1; |
| 1634 | } |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1635 | strvec_pop(&argv); |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1636 | } |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1637 | |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1638 | strvec_clear(&argv); |
Johannes Schindelin | d54dea7 | 2019-10-05 11:46:40 -0700 | [diff] [blame] | 1639 | return !!result; |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1640 | } |
| 1641 | |
Jeff Hostetler | aa57b87 | 2017-12-08 15:58:50 +0000 | [diff] [blame] | 1642 | /* |
| 1643 | * Fetching from the promisor remote should use the given filter-spec |
| 1644 | * or inherit the default filter-spec from the config. |
| 1645 | */ |
| 1646 | static inline void fetch_one_setup_partial(struct remote *remote) |
| 1647 | { |
| 1648 | /* |
| 1649 | * Explicit --no-filter argument overrides everything, regardless |
| 1650 | * of any prior partial clones and fetches. |
| 1651 | */ |
| 1652 | if (filter_options.no_filter) |
| 1653 | return; |
| 1654 | |
| 1655 | /* |
| 1656 | * If no prior partial clone/fetch and the current fetch DID NOT |
| 1657 | * request a partial-fetch, do a normal fetch. |
| 1658 | */ |
Christian Couder | b14ed5a | 2019-06-25 15:40:31 +0200 | [diff] [blame] | 1659 | if (!has_promisor_remote() && !filter_options.choice) |
Jeff Hostetler | aa57b87 | 2017-12-08 15:58:50 +0000 | [diff] [blame] | 1660 | return; |
| 1661 | |
| 1662 | /* |
Christian Couder | 5e46139 | 2019-06-25 15:40:33 +0200 | [diff] [blame] | 1663 | * If this is a partial-fetch request, we enable partial on |
| 1664 | * this repo if not already enabled and remember the given |
| 1665 | * filter-spec as the default for subsequent fetches to this |
| 1666 | * remote. |
Jeff Hostetler | aa57b87 | 2017-12-08 15:58:50 +0000 | [diff] [blame] | 1667 | */ |
Christian Couder | 5e46139 | 2019-06-25 15:40:33 +0200 | [diff] [blame] | 1668 | if (filter_options.choice) { |
Jeff Hostetler | aa57b87 | 2017-12-08 15:58:50 +0000 | [diff] [blame] | 1669 | partial_clone_register(remote->name, &filter_options); |
| 1670 | return; |
| 1671 | } |
| 1672 | |
| 1673 | /* |
Jeff Hostetler | aa57b87 | 2017-12-08 15:58:50 +0000 | [diff] [blame] | 1674 | * Do a partial-fetch from the promisor remote using either the |
| 1675 | * explicitly given filter-spec or inherit the filter-spec from |
| 1676 | * the config. |
| 1677 | */ |
| 1678 | if (!filter_options.choice) |
Christian Couder | fa3d1b6 | 2019-06-25 15:40:32 +0200 | [diff] [blame] | 1679 | partial_clone_get_default_filter_spec(&filter_options, remote->name); |
Jeff Hostetler | aa57b87 | 2017-12-08 15:58:50 +0000 | [diff] [blame] | 1680 | return; |
| 1681 | } |
| 1682 | |
Ævar Arnfjörð Bjarmason | 97716d2 | 2018-02-09 20:32:15 +0000 | [diff] [blame] | 1683 | static int fetch_one(struct remote *remote, int argc, const char **argv, int prune_tags_ok) |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1684 | { |
Brandon Williams | d7c8e30 | 2018-05-16 15:58:04 -0700 | [diff] [blame] | 1685 | struct refspec rs = REFSPEC_INIT_FETCH; |
| 1686 | int i; |
Alex Riesen | 7b7f39e | 2008-04-28 22:23:35 +0200 | [diff] [blame] | 1687 | int exit_code; |
Ævar Arnfjörð Bjarmason | 6317972 | 2018-02-09 20:32:16 +0000 | [diff] [blame] | 1688 | int maybe_prune_tags; |
| 1689 | int remote_via_config = remote_is_configured(remote, 0); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 1690 | |
Daniel Barkalow | fa685bd | 2009-03-11 01:47:20 -0400 | [diff] [blame] | 1691 | if (!remote) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 1692 | die(_("No remote repository specified. Please, specify either a URL or a\n" |
| 1693 | "remote name from which new revisions should be fetched.")); |
Daniel Barkalow | fa685bd | 2009-03-11 01:47:20 -0400 | [diff] [blame] | 1694 | |
Nguyễn Thái Ngọc Duy | 508ea88 | 2016-06-12 17:53:59 +0700 | [diff] [blame] | 1695 | gtransport = prepare_transport(remote, 1); |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 1696 | |
| 1697 | if (prune < 0) { |
| 1698 | /* no command line request */ |
Ævar Arnfjörð Bjarmason | 0711883 | 2018-02-09 20:32:02 +0000 | [diff] [blame] | 1699 | if (0 <= remote->prune) |
| 1700 | prune = remote->prune; |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 1701 | else if (0 <= fetch_prune_config) |
| 1702 | prune = fetch_prune_config; |
| 1703 | else |
| 1704 | prune = PRUNE_BY_DEFAULT; |
| 1705 | } |
| 1706 | |
Ævar Arnfjörð Bjarmason | 97716d2 | 2018-02-09 20:32:15 +0000 | [diff] [blame] | 1707 | if (prune_tags < 0) { |
| 1708 | /* no command line request */ |
| 1709 | if (0 <= remote->prune_tags) |
| 1710 | prune_tags = remote->prune_tags; |
| 1711 | else if (0 <= fetch_prune_tags_config) |
| 1712 | prune_tags = fetch_prune_tags_config; |
| 1713 | else |
| 1714 | prune_tags = PRUNE_TAGS_BY_DEFAULT; |
| 1715 | } |
| 1716 | |
Ævar Arnfjörð Bjarmason | 6317972 | 2018-02-09 20:32:16 +0000 | [diff] [blame] | 1717 | maybe_prune_tags = prune_tags_ok && prune_tags; |
| 1718 | if (maybe_prune_tags && remote_via_config) |
Brandon Williams | 9530350 | 2018-05-16 15:58:02 -0700 | [diff] [blame] | 1719 | refspec_append(&remote->fetch, TAG_REFSPEC); |
Ævar Arnfjörð Bjarmason | 97716d2 | 2018-02-09 20:32:15 +0000 | [diff] [blame] | 1720 | |
Brandon Williams | d7c8e30 | 2018-05-16 15:58:04 -0700 | [diff] [blame] | 1721 | if (maybe_prune_tags && (argc || !remote_via_config)) |
| 1722 | refspec_append(&rs, TAG_REFSPEC); |
Ævar Arnfjörð Bjarmason | 6317972 | 2018-02-09 20:32:16 +0000 | [diff] [blame] | 1723 | |
Brandon Williams | d7c8e30 | 2018-05-16 15:58:04 -0700 | [diff] [blame] | 1724 | for (i = 0; i < argc; i++) { |
| 1725 | if (!strcmp(argv[i], "tag")) { |
| 1726 | char *tag; |
| 1727 | i++; |
| 1728 | if (i >= argc) |
| 1729 | die(_("You need to specify a tag name.")); |
| 1730 | |
| 1731 | tag = xstrfmt("refs/tags/%s:refs/tags/%s", |
| 1732 | argv[i], argv[i]); |
| 1733 | refspec_append(&rs, tag); |
| 1734 | free(tag); |
| 1735 | } else { |
| 1736 | refspec_append(&rs, argv[i]); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 1737 | } |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 1738 | } |
| 1739 | |
Brandon Williams | 5e3548e | 2018-04-23 15:46:24 -0700 | [diff] [blame] | 1740 | if (server_options.nr) |
| 1741 | gtransport->server_options = &server_options; |
| 1742 | |
Jeff King | 57b235a | 2009-01-22 01:03:08 -0500 | [diff] [blame] | 1743 | sigchain_push_common(unlock_pack_on_signal); |
Shawn O. Pearce | e4022ed | 2007-09-14 03:31:25 -0400 | [diff] [blame] | 1744 | atexit(unlock_pack); |
Jeff King | 1435889 | 2019-03-03 11:58:43 -0500 | [diff] [blame] | 1745 | sigchain_push(SIGPIPE, SIG_IGN); |
Brandon Williams | 65a1301 | 2018-05-16 15:58:07 -0700 | [diff] [blame] | 1746 | exit_code = do_fetch(gtransport, &rs); |
Jeff King | 1435889 | 2019-03-03 11:58:43 -0500 | [diff] [blame] | 1747 | sigchain_pop(SIGPIPE); |
Brandon Williams | d7c8e30 | 2018-05-16 15:58:04 -0700 | [diff] [blame] | 1748 | refspec_clear(&rs); |
Junio C Hamano | af23445 | 2013-08-07 15:38:45 -0700 | [diff] [blame] | 1749 | transport_disconnect(gtransport); |
| 1750 | gtransport = NULL; |
Alex Riesen | 7b7f39e | 2008-04-28 22:23:35 +0200 | [diff] [blame] | 1751 | return exit_code; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 1752 | } |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1753 | |
| 1754 | int cmd_fetch(int argc, const char **argv, const char *prefix) |
| 1755 | { |
| 1756 | int i; |
Keith McGuigan | b7410f6 | 2016-06-14 14:28:56 -0400 | [diff] [blame] | 1757 | struct string_list list = STRING_LIST_INIT_DUP; |
Jonathan Tan | a174334 | 2017-12-08 15:58:43 +0000 | [diff] [blame] | 1758 | struct remote *remote = NULL; |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1759 | int result = 0; |
Junio C Hamano | c1a7902 | 2018-03-06 14:54:01 -0800 | [diff] [blame] | 1760 | int prune_tags_ok = 1; |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1761 | |
Jeff King | bbc30f9 | 2011-02-24 09:30:19 -0500 | [diff] [blame] | 1762 | packet_trace_identity("fetch"); |
| 1763 | |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1764 | /* Record the command line for the reflog */ |
| 1765 | strbuf_addstr(&default_rla, "fetch"); |
Johannes Schindelin | 46da295 | 2020-06-04 20:08:29 +0000 | [diff] [blame] | 1766 | for (i = 1; i < argc; i++) { |
| 1767 | /* This handles non-URLs gracefully */ |
| 1768 | char *anon = transport_anonymize_url(argv[i]); |
| 1769 | |
| 1770 | strbuf_addf(&default_rla, " %s", anon); |
| 1771 | free(anon); |
| 1772 | } |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1773 | |
Johannes Schindelin | d54dea7 | 2019-10-05 11:46:40 -0700 | [diff] [blame] | 1774 | fetch_config_from_gitmodules(&submodule_fetch_jobs_config, |
| 1775 | &recurse_submodules); |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 1776 | git_config(git_fetch_config, NULL); |
| 1777 | |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1778 | argc = parse_options(argc, argv, prefix, |
| 1779 | builtin_fetch_options, builtin_fetch_usage, 0); |
| 1780 | |
Nguyễn Thái Ngọc Duy | cccf74e | 2016-06-12 17:54:09 +0700 | [diff] [blame] | 1781 | if (deepen_relative) { |
| 1782 | if (deepen_relative < 0) |
| 1783 | die(_("Negative depth in --deepen is not supported")); |
| 1784 | if (depth) |
| 1785 | die(_("--deepen and --depth are mutually exclusive")); |
| 1786 | depth = xstrfmt("%d", deepen_relative); |
| 1787 | } |
Nguyễn Thái Ngọc Duy | 4dcb167 | 2013-01-11 16:05:46 +0700 | [diff] [blame] | 1788 | if (unshallow) { |
| 1789 | if (depth) |
| 1790 | die(_("--depth and --unshallow cannot be used together")); |
Stefan Beller | c881348 | 2018-05-17 15:51:46 -0700 | [diff] [blame] | 1791 | else if (!is_repository_shallow(the_repository)) |
Nguyễn Thái Ngọc Duy | 4dcb167 | 2013-01-11 16:05:46 +0700 | [diff] [blame] | 1792 | die(_("--unshallow on a complete repository does not make sense")); |
Jeff King | 2805bb5 | 2015-09-24 17:07:07 -0400 | [diff] [blame] | 1793 | else |
| 1794 | depth = xstrfmt("%d", INFINITE_DEPTH); |
Nguyễn Thái Ngọc Duy | 4dcb167 | 2013-01-11 16:05:46 +0700 | [diff] [blame] | 1795 | } |
| 1796 | |
Nguyễn Thái Ngọc Duy | 5594bca | 2013-12-05 10:31:11 +0700 | [diff] [blame] | 1797 | /* no need to be strict, transport_set_option() will validate it again */ |
| 1798 | if (depth && atoi(depth) < 1) |
| 1799 | die(_("depth %s is not a positive number"), depth); |
Nguyễn Thái Ngọc Duy | a45a260 | 2016-06-12 17:54:04 +0700 | [diff] [blame] | 1800 | if (depth || deepen_since || deepen_not.nr) |
Nguyễn Thái Ngọc Duy | 508ea88 | 2016-06-12 17:53:59 +0700 | [diff] [blame] | 1801 | deepen = 1; |
Nguyễn Thái Ngọc Duy | 5594bca | 2013-12-05 10:31:11 +0700 | [diff] [blame] | 1802 | |
Junio C Hamano | 887952b | 2020-08-18 14:25:22 +0000 | [diff] [blame] | 1803 | /* FETCH_HEAD never gets updated in --dry-run mode */ |
| 1804 | if (dry_run) |
| 1805 | write_fetch_head = 0; |
| 1806 | |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1807 | if (all) { |
| 1808 | if (argc == 1) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 1809 | die(_("fetch --all does not take a repository argument")); |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1810 | else if (argc > 1) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 1811 | die(_("fetch --all does not make sense with refspecs")); |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1812 | (void) for_each_remote(get_one_remote_for_fetch, &list); |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1813 | } else if (argc == 0) { |
| 1814 | /* No arguments -- use default remote */ |
| 1815 | remote = remote_get(NULL); |
Björn Gustavsson | 16679e3 | 2009-11-09 21:10:32 +0100 | [diff] [blame] | 1816 | } else if (multiple) { |
| 1817 | /* All arguments are assumed to be remotes or groups */ |
| 1818 | for (i = 0; i < argc; i++) |
| 1819 | if (!add_remote_or_group(argv[i], &list)) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 1820 | die(_("No such remote or remote group: %s"), argv[i]); |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1821 | } else { |
| 1822 | /* Single remote or group */ |
| 1823 | (void) add_remote_or_group(argv[0], &list); |
| 1824 | if (list.nr > 1) { |
| 1825 | /* More than one remote */ |
| 1826 | if (argc > 1) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 1827 | die(_("Fetching a group and specifying refspecs does not make sense")); |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1828 | } else { |
| 1829 | /* Zero or one remotes */ |
| 1830 | remote = remote_get(argv[0]); |
Junio C Hamano | c1a7902 | 2018-03-06 14:54:01 -0800 | [diff] [blame] | 1831 | prune_tags_ok = (argc == 1); |
Jonathan Tan | a174334 | 2017-12-08 15:58:43 +0000 | [diff] [blame] | 1832 | argc--; |
| 1833 | argv++; |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1834 | } |
| 1835 | } |
| 1836 | |
Jeff Hostetler | acb0c57 | 2017-12-08 15:58:44 +0000 | [diff] [blame] | 1837 | if (remote) { |
Christian Couder | b14ed5a | 2019-06-25 15:40:31 +0200 | [diff] [blame] | 1838 | if (filter_options.choice || has_promisor_remote()) |
Jeff Hostetler | aa57b87 | 2017-12-08 15:58:50 +0000 | [diff] [blame] | 1839 | fetch_one_setup_partial(remote); |
Junio C Hamano | c1a7902 | 2018-03-06 14:54:01 -0800 | [diff] [blame] | 1840 | result = fetch_one(remote, argc, argv, prune_tags_ok); |
Jeff Hostetler | acb0c57 | 2017-12-08 15:58:44 +0000 | [diff] [blame] | 1841 | } else { |
Johannes Schindelin | d54dea7 | 2019-10-05 11:46:40 -0700 | [diff] [blame] | 1842 | int max_children = max_jobs; |
| 1843 | |
Jeff Hostetler | acb0c57 | 2017-12-08 15:58:44 +0000 | [diff] [blame] | 1844 | if (filter_options.choice) |
Christian Couder | e013787 | 2019-01-13 09:52:19 +0100 | [diff] [blame] | 1845 | die(_("--filter can only be used with the remote " |
| 1846 | "configured in extensions.partialclone")); |
Johannes Schindelin | d54dea7 | 2019-10-05 11:46:40 -0700 | [diff] [blame] | 1847 | |
| 1848 | if (max_children < 0) |
| 1849 | max_children = fetch_parallel_config; |
| 1850 | |
Jeff Hostetler | aa57b87 | 2017-12-08 15:58:50 +0000 | [diff] [blame] | 1851 | /* TODO should this also die if we have a previous partial-clone? */ |
Johannes Schindelin | d54dea7 | 2019-10-05 11:46:40 -0700 | [diff] [blame] | 1852 | result = fetch_multiple(&list, max_children); |
Jeff Hostetler | acb0c57 | 2017-12-08 15:58:44 +0000 | [diff] [blame] | 1853 | } |
Jonathan Tan | a174334 | 2017-12-08 15:58:43 +0000 | [diff] [blame] | 1854 | |
Jens Lehmann | be254a0 | 2010-11-11 00:55:02 +0100 | [diff] [blame] | 1855 | if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) { |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1856 | struct strvec options = STRVEC_INIT; |
Johannes Schindelin | d54dea7 | 2019-10-05 11:46:40 -0700 | [diff] [blame] | 1857 | int max_children = max_jobs; |
| 1858 | |
| 1859 | if (max_children < 0) |
| 1860 | max_children = submodule_fetch_jobs_config; |
| 1861 | if (max_children < 0) |
| 1862 | max_children = fetch_parallel_config; |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 1863 | |
| 1864 | add_options_to_argv(&options); |
Brandon Williams | e724197 | 2017-12-12 11:53:52 -0800 | [diff] [blame] | 1865 | result = fetch_populated_submodules(the_repository, |
| 1866 | &options, |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 1867 | submodule_prefix, |
Jens Lehmann | 8f0700d | 2011-03-06 23:11:21 +0100 | [diff] [blame] | 1868 | recurse_submodules, |
Brandon Williams | 8fa2915 | 2017-08-02 12:49:19 -0700 | [diff] [blame] | 1869 | recurse_submodules_default, |
Stefan Beller | 62104ba | 2015-12-15 16:04:12 -0800 | [diff] [blame] | 1870 | verbosity < 0, |
| 1871 | max_children); |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1872 | strvec_clear(&options); |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 1873 | } |
| 1874 | |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1875 | string_list_clear(&list, 0); |
| 1876 | |
Derrick Stolee | 50f26bd | 2019-09-02 19:22:02 -0700 | [diff] [blame] | 1877 | prepare_repo_settings(the_repository); |
Johannes Schindelin | c14e6e7 | 2019-11-03 00:21:56 +0000 | [diff] [blame] | 1878 | if (fetch_write_commit_graph > 0 || |
| 1879 | (fetch_write_commit_graph < 0 && |
| 1880 | the_repository->settings.fetch_write_commit_graph)) { |
Junio C Hamano | 5a53509 | 2019-09-30 13:19:32 +0900 | [diff] [blame] | 1881 | int commit_graph_flags = COMMIT_GRAPH_WRITE_SPLIT; |
Derrick Stolee | 50f26bd | 2019-09-02 19:22:02 -0700 | [diff] [blame] | 1882 | |
| 1883 | if (progress) |
Junio C Hamano | 5a53509 | 2019-09-30 13:19:32 +0900 | [diff] [blame] | 1884 | commit_graph_flags |= COMMIT_GRAPH_WRITE_PROGRESS; |
Derrick Stolee | 50f26bd | 2019-09-02 19:22:02 -0700 | [diff] [blame] | 1885 | |
Taylor Blau | 0bd52e2 | 2020-02-03 21:51:50 -0800 | [diff] [blame] | 1886 | write_commit_graph_reachable(the_repository->objects->odb, |
Derrick Stolee | 50f26bd | 2019-09-02 19:22:02 -0700 | [diff] [blame] | 1887 | commit_graph_flags, |
Derrick Stolee | 63020f1 | 2020-01-02 16:14:14 +0000 | [diff] [blame] | 1888 | NULL); |
Derrick Stolee | 50f26bd | 2019-09-02 19:22:02 -0700 | [diff] [blame] | 1889 | } |
| 1890 | |
Derrick Stolee | 2d511cf | 2019-05-17 11:41:49 -0700 | [diff] [blame] | 1891 | close_object_store(the_repository->objects); |
Johannes Schindelin | 0898c96 | 2016-01-13 18:20:11 +0100 | [diff] [blame] | 1892 | |
Junio C Hamano | 850b6ed | 2020-05-06 13:18:29 -0700 | [diff] [blame] | 1893 | if (enable_auto_gc) |
| 1894 | run_auto_gc(verbosity < 0); |
Jeff King | 131b8fc | 2013-01-26 17:40:38 -0500 | [diff] [blame] | 1895 | |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1896 | return result; |
| 1897 | } |