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