Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 1 | #include "cache.h" |
Brandon Williams | b2141fc | 2017-06-14 11:07:36 -0700 | [diff] [blame] | 2 | #include "config.h" |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 3 | #include "remote.h" |
| 4 | #include "refs.h" |
Brandon Williams | ec0cb49 | 2018-05-16 15:57:48 -0700 | [diff] [blame] | 5 | #include "refspec.h" |
Stefan Beller | cbd53a2 | 2018-05-15 16:42:15 -0700 | [diff] [blame] | 6 | #include "object-store.h" |
Junio C Hamano | 6d21bf9 | 2008-07-02 00:51:18 -0700 | [diff] [blame] | 7 | #include "commit.h" |
| 8 | #include "diff.h" |
| 9 | #include "revision.h" |
Alexander Potashev | 8ca12c0 | 2009-01-10 15:07:50 +0300 | [diff] [blame] | 10 | #include "dir.h" |
Jay Soffian | ec8452d | 2009-02-25 03:32:12 -0500 | [diff] [blame] | 11 | #include "tag.h" |
Julian Phillips | 73cf082 | 2009-10-25 21:28:11 +0000 | [diff] [blame] | 12 | #include "string-list.h" |
Jeff King | ed81c76 | 2012-05-21 18:19:28 -0400 | [diff] [blame] | 13 | #include "mergesort.h" |
Jeff King | 0b282cc | 2015-09-24 17:07:58 -0400 | [diff] [blame] | 14 | #include "argv-array.h" |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 15 | |
Felipe Contreras | 6ddba5e | 2012-02-23 00:43:41 +0200 | [diff] [blame] | 16 | enum map_direction { FROM_SRC, FROM_DST }; |
| 17 | |
Junio C Hamano | 844112c | 2008-02-24 22:25:04 -0800 | [diff] [blame] | 18 | struct counted_string { |
| 19 | size_t len; |
| 20 | const char *s; |
| 21 | }; |
Daniel Barkalow | 55029ae | 2008-02-20 13:43:53 -0500 | [diff] [blame] | 22 | struct rewrite { |
| 23 | const char *base; |
Junio C Hamano | 844112c | 2008-02-24 22:25:04 -0800 | [diff] [blame] | 24 | size_t baselen; |
| 25 | struct counted_string *instead_of; |
Daniel Barkalow | 55029ae | 2008-02-20 13:43:53 -0500 | [diff] [blame] | 26 | int instead_of_nr; |
| 27 | int instead_of_alloc; |
| 28 | }; |
Josh Triplett | d071d94 | 2009-09-07 01:56:00 -0700 | [diff] [blame] | 29 | struct rewrites { |
| 30 | struct rewrite **rewrite; |
| 31 | int rewrite_alloc; |
| 32 | int rewrite_nr; |
| 33 | }; |
Daniel Barkalow | 55029ae | 2008-02-20 13:43:53 -0500 | [diff] [blame] | 34 | |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 35 | static struct remote **remotes; |
Daniel Barkalow | 2d31347 | 2008-02-18 23:41:41 -0500 | [diff] [blame] | 36 | static int remotes_alloc; |
| 37 | static int remotes_nr; |
Patrick Reynolds | d0da003 | 2014-07-29 14:43:39 +0000 | [diff] [blame] | 38 | static struct hashmap remotes_hash; |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 39 | |
Daniel Barkalow | cf81834 | 2007-09-10 23:02:56 -0400 | [diff] [blame] | 40 | static struct branch **branches; |
Daniel Barkalow | 2d31347 | 2008-02-18 23:41:41 -0500 | [diff] [blame] | 41 | static int branches_alloc; |
| 42 | static int branches_nr; |
Daniel Barkalow | cf81834 | 2007-09-10 23:02:56 -0400 | [diff] [blame] | 43 | |
| 44 | static struct branch *current_branch; |
Ramkumar Ramachandra | f24f715 | 2013-04-02 13:10:32 +0530 | [diff] [blame] | 45 | static const char *pushremote_name; |
Daniel Barkalow | cf81834 | 2007-09-10 23:02:56 -0400 | [diff] [blame] | 46 | |
Josh Triplett | d071d94 | 2009-09-07 01:56:00 -0700 | [diff] [blame] | 47 | static struct rewrites rewrites; |
Josh Triplett | 1c2eafb | 2009-09-07 01:56:33 -0700 | [diff] [blame] | 48 | static struct rewrites rewrites_push; |
Daniel Barkalow | 55029ae | 2008-02-20 13:43:53 -0500 | [diff] [blame] | 49 | |
Daniel Barkalow | 0a4da29 | 2009-11-18 02:42:23 +0100 | [diff] [blame] | 50 | static int valid_remote(const struct remote *remote) |
| 51 | { |
Daniel Barkalow | c578f51 | 2009-11-18 02:42:25 +0100 | [diff] [blame] | 52 | return (!!remote->url) || (!!remote->foreign_vcs); |
Daniel Barkalow | 0a4da29 | 2009-11-18 02:42:23 +0100 | [diff] [blame] | 53 | } |
| 54 | |
Josh Triplett | d071d94 | 2009-09-07 01:56:00 -0700 | [diff] [blame] | 55 | static const char *alias_url(const char *url, struct rewrites *r) |
Daniel Barkalow | 55029ae | 2008-02-20 13:43:53 -0500 | [diff] [blame] | 56 | { |
| 57 | int i, j; |
Junio C Hamano | 844112c | 2008-02-24 22:25:04 -0800 | [diff] [blame] | 58 | struct counted_string *longest; |
| 59 | int longest_i; |
| 60 | |
| 61 | longest = NULL; |
| 62 | longest_i = -1; |
Josh Triplett | d071d94 | 2009-09-07 01:56:00 -0700 | [diff] [blame] | 63 | for (i = 0; i < r->rewrite_nr; i++) { |
| 64 | if (!r->rewrite[i]) |
Daniel Barkalow | 55029ae | 2008-02-20 13:43:53 -0500 | [diff] [blame] | 65 | continue; |
Josh Triplett | d071d94 | 2009-09-07 01:56:00 -0700 | [diff] [blame] | 66 | for (j = 0; j < r->rewrite[i]->instead_of_nr; j++) { |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 67 | if (starts_with(url, r->rewrite[i]->instead_of[j].s) && |
Junio C Hamano | 844112c | 2008-02-24 22:25:04 -0800 | [diff] [blame] | 68 | (!longest || |
Josh Triplett | d071d94 | 2009-09-07 01:56:00 -0700 | [diff] [blame] | 69 | longest->len < r->rewrite[i]->instead_of[j].len)) { |
| 70 | longest = &(r->rewrite[i]->instead_of[j]); |
Junio C Hamano | 844112c | 2008-02-24 22:25:04 -0800 | [diff] [blame] | 71 | longest_i = i; |
Daniel Barkalow | 55029ae | 2008-02-20 13:43:53 -0500 | [diff] [blame] | 72 | } |
| 73 | } |
| 74 | } |
Junio C Hamano | 844112c | 2008-02-24 22:25:04 -0800 | [diff] [blame] | 75 | if (!longest) |
| 76 | return url; |
| 77 | |
Jeff King | 75faa45 | 2015-09-24 17:07:03 -0400 | [diff] [blame] | 78 | return xstrfmt("%s%s", r->rewrite[longest_i]->base, url + longest->len); |
Daniel Barkalow | 55029ae | 2008-02-20 13:43:53 -0500 | [diff] [blame] | 79 | } |
| 80 | |
Shawn O. Pearce | 28b91f8 | 2007-09-19 00:49:27 -0400 | [diff] [blame] | 81 | static void add_url(struct remote *remote, const char *url) |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 82 | { |
Daniel Barkalow | 2d31347 | 2008-02-18 23:41:41 -0500 | [diff] [blame] | 83 | ALLOC_GROW(remote->url, remote->url_nr + 1, remote->url_alloc); |
| 84 | remote->url[remote->url_nr++] = url; |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 85 | } |
| 86 | |
Michael J Gruber | 2034623 | 2009-06-09 18:01:34 +0200 | [diff] [blame] | 87 | static void add_pushurl(struct remote *remote, const char *pushurl) |
| 88 | { |
| 89 | ALLOC_GROW(remote->pushurl, remote->pushurl_nr + 1, remote->pushurl_alloc); |
| 90 | remote->pushurl[remote->pushurl_nr++] = pushurl; |
| 91 | } |
| 92 | |
Josh Triplett | 1c2eafb | 2009-09-07 01:56:33 -0700 | [diff] [blame] | 93 | static void add_pushurl_alias(struct remote *remote, const char *url) |
| 94 | { |
| 95 | const char *pushurl = alias_url(url, &rewrites_push); |
| 96 | if (pushurl != url) |
| 97 | add_pushurl(remote, pushurl); |
| 98 | } |
| 99 | |
| 100 | static void add_url_alias(struct remote *remote, const char *url) |
| 101 | { |
| 102 | add_url(remote, alias_url(url, &rewrites)); |
| 103 | add_pushurl_alias(remote, url); |
| 104 | } |
| 105 | |
Patrick Reynolds | d0da003 | 2014-07-29 14:43:39 +0000 | [diff] [blame] | 106 | struct remotes_hash_key { |
| 107 | const char *str; |
| 108 | int len; |
| 109 | }; |
| 110 | |
Stefan Beller | 7663cdc | 2017-06-30 12:14:05 -0700 | [diff] [blame] | 111 | static int remotes_hash_cmp(const void *unused_cmp_data, |
Stefan Beller | 45dcb35 | 2017-06-30 17:28:35 -0700 | [diff] [blame] | 112 | const void *entry, |
| 113 | const void *entry_or_key, |
| 114 | const void *keydata) |
Patrick Reynolds | d0da003 | 2014-07-29 14:43:39 +0000 | [diff] [blame] | 115 | { |
Stefan Beller | 45dcb35 | 2017-06-30 17:28:35 -0700 | [diff] [blame] | 116 | const struct remote *a = entry; |
| 117 | const struct remote *b = entry_or_key; |
| 118 | const struct remotes_hash_key *key = keydata; |
| 119 | |
Patrick Reynolds | d0da003 | 2014-07-29 14:43:39 +0000 | [diff] [blame] | 120 | if (key) |
| 121 | return strncmp(a->name, key->str, key->len) || a->name[key->len]; |
| 122 | else |
| 123 | return strcmp(a->name, b->name); |
| 124 | } |
| 125 | |
| 126 | static inline void init_remotes_hash(void) |
| 127 | { |
| 128 | if (!remotes_hash.cmpfn) |
Stefan Beller | 45dcb35 | 2017-06-30 17:28:35 -0700 | [diff] [blame] | 129 | hashmap_init(&remotes_hash, remotes_hash_cmp, NULL, 0); |
Patrick Reynolds | d0da003 | 2014-07-29 14:43:39 +0000 | [diff] [blame] | 130 | } |
| 131 | |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 132 | static struct remote *make_remote(const char *name, int len) |
| 133 | { |
Patrick Reynolds | d0da003 | 2014-07-29 14:43:39 +0000 | [diff] [blame] | 134 | struct remote *ret, *replaced; |
| 135 | struct remotes_hash_key lookup; |
| 136 | struct hashmap_entry lookup_entry; |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 137 | |
Patrick Reynolds | d0da003 | 2014-07-29 14:43:39 +0000 | [diff] [blame] | 138 | if (!len) |
| 139 | len = strlen(name); |
| 140 | |
| 141 | init_remotes_hash(); |
| 142 | lookup.str = name; |
| 143 | lookup.len = len; |
| 144 | hashmap_entry_init(&lookup_entry, memhash(name, len)); |
| 145 | |
| 146 | if ((ret = hashmap_get(&remotes_hash, &lookup_entry, &lookup)) != NULL) |
| 147 | return ret; |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 148 | |
Daniel Barkalow | 2d31347 | 2008-02-18 23:41:41 -0500 | [diff] [blame] | 149 | ret = xcalloc(1, sizeof(struct remote)); |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 150 | ret->prune = -1; /* unspecified */ |
Ævar Arnfjörð Bjarmason | 97716d2 | 2018-02-09 20:32:15 +0000 | [diff] [blame] | 151 | ret->prune_tags = -1; /* unspecified */ |
Brandon Williams | 6bdb304 | 2018-05-16 15:58:00 -0700 | [diff] [blame] | 152 | ret->name = xstrndup(name, len); |
| 153 | refspec_init(&ret->push, REFSPEC_PUSH); |
Brandon Williams | e5349ab | 2018-05-16 15:58:01 -0700 | [diff] [blame] | 154 | refspec_init(&ret->fetch, REFSPEC_FETCH); |
Brandon Williams | 6bdb304 | 2018-05-16 15:58:00 -0700 | [diff] [blame] | 155 | |
Daniel Barkalow | 2d31347 | 2008-02-18 23:41:41 -0500 | [diff] [blame] | 156 | ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc); |
| 157 | remotes[remotes_nr++] = ret; |
Patrick Reynolds | d0da003 | 2014-07-29 14:43:39 +0000 | [diff] [blame] | 158 | |
| 159 | hashmap_entry_init(ret, lookup_entry.hash); |
| 160 | replaced = hashmap_put(&remotes_hash, ret); |
| 161 | assert(replaced == NULL); /* no previous entry overwritten */ |
Daniel Barkalow | 2d31347 | 2008-02-18 23:41:41 -0500 | [diff] [blame] | 162 | return ret; |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 163 | } |
| 164 | |
Daniel Barkalow | cf81834 | 2007-09-10 23:02:56 -0400 | [diff] [blame] | 165 | static void add_merge(struct branch *branch, const char *name) |
| 166 | { |
Daniel Barkalow | 2d31347 | 2008-02-18 23:41:41 -0500 | [diff] [blame] | 167 | ALLOC_GROW(branch->merge_name, branch->merge_nr + 1, |
| 168 | branch->merge_alloc); |
| 169 | branch->merge_name[branch->merge_nr++] = name; |
Daniel Barkalow | cf81834 | 2007-09-10 23:02:56 -0400 | [diff] [blame] | 170 | } |
| 171 | |
| 172 | static struct branch *make_branch(const char *name, int len) |
| 173 | { |
Daniel Barkalow | 2d31347 | 2008-02-18 23:41:41 -0500 | [diff] [blame] | 174 | struct branch *ret; |
| 175 | int i; |
Daniel Barkalow | cf81834 | 2007-09-10 23:02:56 -0400 | [diff] [blame] | 176 | |
Daniel Barkalow | 2d31347 | 2008-02-18 23:41:41 -0500 | [diff] [blame] | 177 | for (i = 0; i < branches_nr; i++) { |
| 178 | if (len ? (!strncmp(name, branches[i]->name, len) && |
| 179 | !branches[i]->name[len]) : |
| 180 | !strcmp(name, branches[i]->name)) |
| 181 | return branches[i]; |
Daniel Barkalow | cf81834 | 2007-09-10 23:02:56 -0400 | [diff] [blame] | 182 | } |
| 183 | |
Daniel Barkalow | 2d31347 | 2008-02-18 23:41:41 -0500 | [diff] [blame] | 184 | ALLOC_GROW(branches, branches_nr + 1, branches_alloc); |
| 185 | ret = xcalloc(1, sizeof(struct branch)); |
| 186 | branches[branches_nr++] = ret; |
Daniel Barkalow | cf81834 | 2007-09-10 23:02:56 -0400 | [diff] [blame] | 187 | if (len) |
Daniel Barkalow | 2d31347 | 2008-02-18 23:41:41 -0500 | [diff] [blame] | 188 | ret->name = xstrndup(name, len); |
Daniel Barkalow | cf81834 | 2007-09-10 23:02:56 -0400 | [diff] [blame] | 189 | else |
Daniel Barkalow | 2d31347 | 2008-02-18 23:41:41 -0500 | [diff] [blame] | 190 | ret->name = xstrdup(name); |
Jeff King | fa3f60b | 2014-06-18 16:02:13 -0400 | [diff] [blame] | 191 | ret->refname = xstrfmt("refs/heads/%s", ret->name); |
Daniel Barkalow | cf81834 | 2007-09-10 23:02:56 -0400 | [diff] [blame] | 192 | |
Daniel Barkalow | 2d31347 | 2008-02-18 23:41:41 -0500 | [diff] [blame] | 193 | return ret; |
Daniel Barkalow | cf81834 | 2007-09-10 23:02:56 -0400 | [diff] [blame] | 194 | } |
| 195 | |
Josh Triplett | d071d94 | 2009-09-07 01:56:00 -0700 | [diff] [blame] | 196 | static struct rewrite *make_rewrite(struct rewrites *r, const char *base, int len) |
Daniel Barkalow | 55029ae | 2008-02-20 13:43:53 -0500 | [diff] [blame] | 197 | { |
| 198 | struct rewrite *ret; |
| 199 | int i; |
| 200 | |
Josh Triplett | d071d94 | 2009-09-07 01:56:00 -0700 | [diff] [blame] | 201 | for (i = 0; i < r->rewrite_nr; i++) { |
Junio C Hamano | 844112c | 2008-02-24 22:25:04 -0800 | [diff] [blame] | 202 | if (len |
Josh Triplett | d071d94 | 2009-09-07 01:56:00 -0700 | [diff] [blame] | 203 | ? (len == r->rewrite[i]->baselen && |
| 204 | !strncmp(base, r->rewrite[i]->base, len)) |
| 205 | : !strcmp(base, r->rewrite[i]->base)) |
| 206 | return r->rewrite[i]; |
Daniel Barkalow | 55029ae | 2008-02-20 13:43:53 -0500 | [diff] [blame] | 207 | } |
| 208 | |
Josh Triplett | d071d94 | 2009-09-07 01:56:00 -0700 | [diff] [blame] | 209 | ALLOC_GROW(r->rewrite, r->rewrite_nr + 1, r->rewrite_alloc); |
Daniel Barkalow | 55029ae | 2008-02-20 13:43:53 -0500 | [diff] [blame] | 210 | ret = xcalloc(1, sizeof(struct rewrite)); |
Josh Triplett | d071d94 | 2009-09-07 01:56:00 -0700 | [diff] [blame] | 211 | r->rewrite[r->rewrite_nr++] = ret; |
Junio C Hamano | 844112c | 2008-02-24 22:25:04 -0800 | [diff] [blame] | 212 | if (len) { |
Daniel Barkalow | 55029ae | 2008-02-20 13:43:53 -0500 | [diff] [blame] | 213 | ret->base = xstrndup(base, len); |
Junio C Hamano | 844112c | 2008-02-24 22:25:04 -0800 | [diff] [blame] | 214 | ret->baselen = len; |
| 215 | } |
| 216 | else { |
Daniel Barkalow | 55029ae | 2008-02-20 13:43:53 -0500 | [diff] [blame] | 217 | ret->base = xstrdup(base); |
Junio C Hamano | 844112c | 2008-02-24 22:25:04 -0800 | [diff] [blame] | 218 | ret->baselen = strlen(base); |
| 219 | } |
Daniel Barkalow | 55029ae | 2008-02-20 13:43:53 -0500 | [diff] [blame] | 220 | return ret; |
| 221 | } |
| 222 | |
| 223 | static void add_instead_of(struct rewrite *rewrite, const char *instead_of) |
| 224 | { |
| 225 | ALLOC_GROW(rewrite->instead_of, rewrite->instead_of_nr + 1, rewrite->instead_of_alloc); |
Junio C Hamano | 844112c | 2008-02-24 22:25:04 -0800 | [diff] [blame] | 226 | rewrite->instead_of[rewrite->instead_of_nr].s = instead_of; |
| 227 | rewrite->instead_of[rewrite->instead_of_nr].len = strlen(instead_of); |
| 228 | rewrite->instead_of_nr++; |
Daniel Barkalow | 55029ae | 2008-02-20 13:43:53 -0500 | [diff] [blame] | 229 | } |
| 230 | |
Jeff King | 0e265a9 | 2015-09-24 17:07:20 -0400 | [diff] [blame] | 231 | static const char *skip_spaces(const char *s) |
| 232 | { |
| 233 | while (isspace(*s)) |
| 234 | s++; |
| 235 | return s; |
| 236 | } |
| 237 | |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 238 | static void read_remotes_file(struct remote *remote) |
| 239 | { |
Jeff King | 0e265a9 | 2015-09-24 17:07:20 -0400 | [diff] [blame] | 240 | struct strbuf buf = STRBUF_INIT; |
Nguyễn Thái Ngọc Duy | e9d983f | 2017-05-03 17:16:50 +0700 | [diff] [blame] | 241 | FILE *f = fopen_or_warn(git_path("remotes/%s", remote->name), "r"); |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 242 | |
| 243 | if (!f) |
| 244 | return; |
Johannes Schindelin | e459b07 | 2017-01-19 22:20:02 +0100 | [diff] [blame] | 245 | remote->configured_in_repo = 1; |
Miklos Vajna | 89cf4c7 | 2008-11-10 21:43:00 +0100 | [diff] [blame] | 246 | remote->origin = REMOTE_REMOTES; |
Junio C Hamano | 18814d0 | 2015-10-28 13:27:33 -0700 | [diff] [blame] | 247 | while (strbuf_getline(&buf, f) != EOF) { |
Jeff King | 0e265a9 | 2015-09-24 17:07:20 -0400 | [diff] [blame] | 248 | const char *v; |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 249 | |
Jeff King | 0e265a9 | 2015-09-24 17:07:20 -0400 | [diff] [blame] | 250 | strbuf_rtrim(&buf); |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 251 | |
Jeff King | 0e265a9 | 2015-09-24 17:07:20 -0400 | [diff] [blame] | 252 | if (skip_prefix(buf.buf, "URL:", &v)) |
| 253 | add_url_alias(remote, xstrdup(skip_spaces(v))); |
| 254 | else if (skip_prefix(buf.buf, "Push:", &v)) |
Brandon Williams | 6bdb304 | 2018-05-16 15:58:00 -0700 | [diff] [blame] | 255 | refspec_append(&remote->push, skip_spaces(v)); |
Jeff King | 0e265a9 | 2015-09-24 17:07:20 -0400 | [diff] [blame] | 256 | else if (skip_prefix(buf.buf, "Pull:", &v)) |
Brandon Williams | e5349ab | 2018-05-16 15:58:01 -0700 | [diff] [blame] | 257 | refspec_append(&remote->fetch, skip_spaces(v)); |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 258 | } |
Jeff King | 0e265a9 | 2015-09-24 17:07:20 -0400 | [diff] [blame] | 259 | strbuf_release(&buf); |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 260 | fclose(f); |
| 261 | } |
| 262 | |
| 263 | static void read_branches_file(struct remote *remote) |
| 264 | { |
Daniel Barkalow | cf81834 | 2007-09-10 23:02:56 -0400 | [diff] [blame] | 265 | char *frag; |
Jeff King | f28e3ab | 2015-09-24 17:07:18 -0400 | [diff] [blame] | 266 | struct strbuf buf = STRBUF_INIT; |
Nguyễn Thái Ngọc Duy | e9d983f | 2017-05-03 17:16:50 +0700 | [diff] [blame] | 267 | FILE *f = fopen_or_warn(git_path("branches/%s", remote->name), "r"); |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 268 | |
| 269 | if (!f) |
| 270 | return; |
Jeff King | f28e3ab | 2015-09-24 17:07:18 -0400 | [diff] [blame] | 271 | |
Junio C Hamano | 8f309ae | 2016-01-13 15:31:17 -0800 | [diff] [blame] | 272 | strbuf_getline_lf(&buf, f); |
Johannes Sixt | 0fb1990 | 2015-10-23 08:02:51 +0200 | [diff] [blame] | 273 | fclose(f); |
Jeff King | f28e3ab | 2015-09-24 17:07:18 -0400 | [diff] [blame] | 274 | strbuf_trim(&buf); |
| 275 | if (!buf.len) { |
| 276 | strbuf_release(&buf); |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 277 | return; |
Jeff King | f28e3ab | 2015-09-24 17:07:18 -0400 | [diff] [blame] | 278 | } |
| 279 | |
Johannes Schindelin | e459b07 | 2017-01-19 22:20:02 +0100 | [diff] [blame] | 280 | remote->configured_in_repo = 1; |
Miklos Vajna | 89cf4c7 | 2008-11-10 21:43:00 +0100 | [diff] [blame] | 281 | remote->origin = REMOTE_BRANCHES; |
Daniel Barkalow | 472fa4c | 2008-03-25 19:35:28 -0400 | [diff] [blame] | 282 | |
| 283 | /* |
Ramkumar Ramachandra | 55cfde2 | 2013-06-22 13:28:12 +0530 | [diff] [blame] | 284 | * The branches file would have URL and optionally |
Daniel Barkalow | 472fa4c | 2008-03-25 19:35:28 -0400 | [diff] [blame] | 285 | * #branch specified. The "master" (or specified) branch is |
Jeff King | f28e3ab | 2015-09-24 17:07:18 -0400 | [diff] [blame] | 286 | * fetched and stored in the local branch matching the |
| 287 | * remote name. |
Daniel Barkalow | 472fa4c | 2008-03-25 19:35:28 -0400 | [diff] [blame] | 288 | */ |
Jeff King | f28e3ab | 2015-09-24 17:07:18 -0400 | [diff] [blame] | 289 | frag = strchr(buf.buf, '#'); |
| 290 | if (frag) |
Daniel Barkalow | cf81834 | 2007-09-10 23:02:56 -0400 | [diff] [blame] | 291 | *(frag++) = '\0'; |
Jeff King | f28e3ab | 2015-09-24 17:07:18 -0400 | [diff] [blame] | 292 | else |
| 293 | frag = "master"; |
Ramkumar Ramachandra | 55cfde2 | 2013-06-22 13:28:12 +0530 | [diff] [blame] | 294 | |
Jeff King | f28e3ab | 2015-09-24 17:07:18 -0400 | [diff] [blame] | 295 | add_url_alias(remote, strbuf_detach(&buf, NULL)); |
Brandon Williams | e5349ab | 2018-05-16 15:58:01 -0700 | [diff] [blame] | 296 | strbuf_addf(&buf, "refs/heads/%s:refs/heads/%s", |
| 297 | frag, remote->name); |
| 298 | refspec_append(&remote->fetch, buf.buf); |
Jeff King | f28e3ab | 2015-09-24 17:07:18 -0400 | [diff] [blame] | 299 | |
Martin Koegler | 18afe10 | 2008-11-10 22:47:11 +0100 | [diff] [blame] | 300 | /* |
| 301 | * Cogito compatible push: push current HEAD to remote #branch |
| 302 | * (master if missing) |
| 303 | */ |
Brandon Williams | e5349ab | 2018-05-16 15:58:01 -0700 | [diff] [blame] | 304 | strbuf_reset(&buf); |
Brandon Williams | 6bdb304 | 2018-05-16 15:58:00 -0700 | [diff] [blame] | 305 | strbuf_addf(&buf, "HEAD:refs/heads/%s", frag); |
| 306 | refspec_append(&remote->push, buf.buf); |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 307 | remote->fetch_tags = 1; /* always auto-follow */ |
Brandon Williams | 6bdb304 | 2018-05-16 15:58:00 -0700 | [diff] [blame] | 308 | strbuf_release(&buf); |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 309 | } |
| 310 | |
Johannes Schindelin | ef90d6d | 2008-05-14 18:46:53 +0100 | [diff] [blame] | 311 | static int handle_config(const char *key, const char *value, void *cb) |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 312 | { |
| 313 | const char *name; |
Thomas Gummerer | bc60f8a | 2016-02-16 10:47:49 +0100 | [diff] [blame] | 314 | int namelen; |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 315 | const char *subkey; |
| 316 | struct remote *remote; |
Daniel Barkalow | cf81834 | 2007-09-10 23:02:56 -0400 | [diff] [blame] | 317 | struct branch *branch; |
Thomas Gummerer | bc60f8a | 2016-02-16 10:47:49 +0100 | [diff] [blame] | 318 | if (parse_config_key(key, "branch", &name, &namelen, &subkey) >= 0) { |
| 319 | if (!name) |
Daniel Barkalow | cf81834 | 2007-09-10 23:02:56 -0400 | [diff] [blame] | 320 | return 0; |
Thomas Gummerer | bc60f8a | 2016-02-16 10:47:49 +0100 | [diff] [blame] | 321 | branch = make_branch(name, namelen); |
| 322 | if (!strcmp(subkey, "remote")) { |
Jeff King | e41bf35 | 2015-05-01 18:44:41 -0400 | [diff] [blame] | 323 | return git_config_string(&branch->remote_name, key, value); |
Thomas Gummerer | bc60f8a | 2016-02-16 10:47:49 +0100 | [diff] [blame] | 324 | } else if (!strcmp(subkey, "pushremote")) { |
Jeff King | da66b27 | 2015-05-21 00:45:20 -0400 | [diff] [blame] | 325 | return git_config_string(&branch->pushremote_name, key, value); |
Thomas Gummerer | bc60f8a | 2016-02-16 10:47:49 +0100 | [diff] [blame] | 326 | } else if (!strcmp(subkey, "merge")) { |
Junio C Hamano | d2370cc | 2008-02-11 11:00:10 -0800 | [diff] [blame] | 327 | if (!value) |
| 328 | return config_error_nonbool(key); |
Daniel Barkalow | cf81834 | 2007-09-10 23:02:56 -0400 | [diff] [blame] | 329 | add_merge(branch, xstrdup(value)); |
Junio C Hamano | d2370cc | 2008-02-11 11:00:10 -0800 | [diff] [blame] | 330 | } |
Daniel Barkalow | cf81834 | 2007-09-10 23:02:56 -0400 | [diff] [blame] | 331 | return 0; |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 332 | } |
Thomas Gummerer | bc60f8a | 2016-02-16 10:47:49 +0100 | [diff] [blame] | 333 | if (parse_config_key(key, "url", &name, &namelen, &subkey) >= 0) { |
Daniel Barkalow | 55029ae | 2008-02-20 13:43:53 -0500 | [diff] [blame] | 334 | struct rewrite *rewrite; |
Thomas Gummerer | bc60f8a | 2016-02-16 10:47:49 +0100 | [diff] [blame] | 335 | if (!name) |
Daniel Barkalow | 55029ae | 2008-02-20 13:43:53 -0500 | [diff] [blame] | 336 | return 0; |
Thomas Gummerer | bc60f8a | 2016-02-16 10:47:49 +0100 | [diff] [blame] | 337 | if (!strcmp(subkey, "insteadof")) { |
| 338 | rewrite = make_rewrite(&rewrites, name, namelen); |
Josh Triplett | 1c2eafb | 2009-09-07 01:56:33 -0700 | [diff] [blame] | 339 | if (!value) |
| 340 | return config_error_nonbool(key); |
| 341 | add_instead_of(rewrite, xstrdup(value)); |
Thomas Gummerer | bc60f8a | 2016-02-16 10:47:49 +0100 | [diff] [blame] | 342 | } else if (!strcmp(subkey, "pushinsteadof")) { |
| 343 | rewrite = make_rewrite(&rewrites_push, name, namelen); |
Daniel Barkalow | 55029ae | 2008-02-20 13:43:53 -0500 | [diff] [blame] | 344 | if (!value) |
| 345 | return config_error_nonbool(key); |
| 346 | add_instead_of(rewrite, xstrdup(value)); |
| 347 | } |
| 348 | } |
Ramkumar Ramachandra | 224c217 | 2013-04-02 13:10:33 +0530 | [diff] [blame] | 349 | |
Thomas Gummerer | bc60f8a | 2016-02-16 10:47:49 +0100 | [diff] [blame] | 350 | if (parse_config_key(key, "remote", &name, &namelen, &subkey) < 0) |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 351 | return 0; |
Ramkumar Ramachandra | 224c217 | 2013-04-02 13:10:33 +0530 | [diff] [blame] | 352 | |
| 353 | /* Handle remote.* variables */ |
Thomas Gummerer | bc60f8a | 2016-02-16 10:47:49 +0100 | [diff] [blame] | 354 | if (!name && !strcmp(subkey, "pushdefault")) |
Ramkumar Ramachandra | 224c217 | 2013-04-02 13:10:33 +0530 | [diff] [blame] | 355 | return git_config_string(&pushremote_name, key, value); |
| 356 | |
Thomas Gummerer | bc60f8a | 2016-02-16 10:47:49 +0100 | [diff] [blame] | 357 | if (!name) |
| 358 | return 0; |
Ramkumar Ramachandra | 224c217 | 2013-04-02 13:10:33 +0530 | [diff] [blame] | 359 | /* Handle remote.<name>.* variables */ |
Brandon Casey | c82efaf | 2008-10-14 15:30:21 -0500 | [diff] [blame] | 360 | if (*name == '/') { |
| 361 | warning("Config remote shorthand cannot begin with '/': %s", |
| 362 | name); |
| 363 | return 0; |
| 364 | } |
Thomas Gummerer | bc60f8a | 2016-02-16 10:47:49 +0100 | [diff] [blame] | 365 | remote = make_remote(name, namelen); |
Miklos Vajna | 89cf4c7 | 2008-11-10 21:43:00 +0100 | [diff] [blame] | 366 | remote->origin = REMOTE_CONFIG; |
Johannes Schindelin | e459b07 | 2017-01-19 22:20:02 +0100 | [diff] [blame] | 367 | if (current_config_scope() == CONFIG_SCOPE_REPO) |
| 368 | remote->configured_in_repo = 1; |
Thomas Gummerer | bc60f8a | 2016-02-16 10:47:49 +0100 | [diff] [blame] | 369 | if (!strcmp(subkey, "mirror")) |
Paolo Bonzini | 84bb2df | 2008-04-17 13:17:20 +0200 | [diff] [blame] | 370 | remote->mirror = git_config_bool(key, value); |
Thomas Gummerer | bc60f8a | 2016-02-16 10:47:49 +0100 | [diff] [blame] | 371 | else if (!strcmp(subkey, "skipdefaultupdate")) |
Paolo Bonzini | 84bb2df | 2008-04-17 13:17:20 +0200 | [diff] [blame] | 372 | remote->skip_default_update = git_config_bool(key, value); |
Thomas Gummerer | bc60f8a | 2016-02-16 10:47:49 +0100 | [diff] [blame] | 373 | else if (!strcmp(subkey, "skipfetchall")) |
Björn Gustavsson | 7cc91a2 | 2009-11-09 21:11:06 +0100 | [diff] [blame] | 374 | remote->skip_default_update = git_config_bool(key, value); |
Thomas Gummerer | bc60f8a | 2016-02-16 10:47:49 +0100 | [diff] [blame] | 375 | else if (!strcmp(subkey, "prune")) |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 376 | remote->prune = git_config_bool(key, value); |
Ævar Arnfjörð Bjarmason | 97716d2 | 2018-02-09 20:32:15 +0000 | [diff] [blame] | 377 | else if (!strcmp(subkey, "prunetags")) |
| 378 | remote->prune_tags = git_config_bool(key, value); |
Thomas Gummerer | bc60f8a | 2016-02-16 10:47:49 +0100 | [diff] [blame] | 379 | else if (!strcmp(subkey, "url")) { |
Paolo Bonzini | 84bb2df | 2008-04-17 13:17:20 +0200 | [diff] [blame] | 380 | const char *v; |
| 381 | if (git_config_string(&v, key, value)) |
| 382 | return -1; |
| 383 | add_url(remote, v); |
Thomas Gummerer | bc60f8a | 2016-02-16 10:47:49 +0100 | [diff] [blame] | 384 | } else if (!strcmp(subkey, "pushurl")) { |
Michael J Gruber | 2034623 | 2009-06-09 18:01:34 +0200 | [diff] [blame] | 385 | const char *v; |
| 386 | if (git_config_string(&v, key, value)) |
| 387 | return -1; |
| 388 | add_pushurl(remote, v); |
Thomas Gummerer | bc60f8a | 2016-02-16 10:47:49 +0100 | [diff] [blame] | 389 | } else if (!strcmp(subkey, "push")) { |
Paolo Bonzini | 84bb2df | 2008-04-17 13:17:20 +0200 | [diff] [blame] | 390 | const char *v; |
| 391 | if (git_config_string(&v, key, value)) |
| 392 | return -1; |
Brandon Williams | 6bdb304 | 2018-05-16 15:58:00 -0700 | [diff] [blame] | 393 | refspec_append(&remote->push, v); |
| 394 | free((char *)v); |
Thomas Gummerer | bc60f8a | 2016-02-16 10:47:49 +0100 | [diff] [blame] | 395 | } else if (!strcmp(subkey, "fetch")) { |
Paolo Bonzini | 84bb2df | 2008-04-17 13:17:20 +0200 | [diff] [blame] | 396 | const char *v; |
| 397 | if (git_config_string(&v, key, value)) |
| 398 | return -1; |
Brandon Williams | e5349ab | 2018-05-16 15:58:01 -0700 | [diff] [blame] | 399 | refspec_append(&remote->fetch, v); |
| 400 | free((char *)v); |
Thomas Gummerer | bc60f8a | 2016-02-16 10:47:49 +0100 | [diff] [blame] | 401 | } else if (!strcmp(subkey, "receivepack")) { |
Paolo Bonzini | 84bb2df | 2008-04-17 13:17:20 +0200 | [diff] [blame] | 402 | const char *v; |
| 403 | if (git_config_string(&v, key, value)) |
| 404 | return -1; |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 405 | if (!remote->receivepack) |
Paolo Bonzini | 84bb2df | 2008-04-17 13:17:20 +0200 | [diff] [blame] | 406 | remote->receivepack = v; |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 407 | else |
| 408 | error("more than one receivepack given, using the first"); |
Thomas Gummerer | bc60f8a | 2016-02-16 10:47:49 +0100 | [diff] [blame] | 409 | } else if (!strcmp(subkey, "uploadpack")) { |
Paolo Bonzini | 84bb2df | 2008-04-17 13:17:20 +0200 | [diff] [blame] | 410 | const char *v; |
| 411 | if (git_config_string(&v, key, value)) |
| 412 | return -1; |
Daniel Barkalow | 0012ba2 | 2007-09-10 23:02:51 -0400 | [diff] [blame] | 413 | if (!remote->uploadpack) |
Paolo Bonzini | 84bb2df | 2008-04-17 13:17:20 +0200 | [diff] [blame] | 414 | remote->uploadpack = v; |
Daniel Barkalow | 0012ba2 | 2007-09-10 23:02:51 -0400 | [diff] [blame] | 415 | else |
| 416 | error("more than one uploadpack given, using the first"); |
Thomas Gummerer | bc60f8a | 2016-02-16 10:47:49 +0100 | [diff] [blame] | 417 | } else if (!strcmp(subkey, "tagopt")) { |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 418 | if (!strcmp(value, "--no-tags")) |
| 419 | remote->fetch_tags = -1; |
Samuel Tardieu | 944163a | 2010-04-20 01:31:25 +0200 | [diff] [blame] | 420 | else if (!strcmp(value, "--tags")) |
| 421 | remote->fetch_tags = 2; |
Thomas Gummerer | bc60f8a | 2016-02-16 10:47:49 +0100 | [diff] [blame] | 422 | } else if (!strcmp(subkey, "proxy")) { |
Paolo Bonzini | 84bb2df | 2008-04-17 13:17:20 +0200 | [diff] [blame] | 423 | return git_config_string((const char **)&remote->http_proxy, |
| 424 | key, value); |
Thomas Gummerer | bc60f8a | 2016-02-16 10:47:49 +0100 | [diff] [blame] | 425 | } else if (!strcmp(subkey, "proxyauthmethod")) { |
Knut Franke | ef97639 | 2016-01-26 13:02:47 +0000 | [diff] [blame] | 426 | return git_config_string((const char **)&remote->http_proxy_authmethod, |
| 427 | key, value); |
Thomas Gummerer | bc60f8a | 2016-02-16 10:47:49 +0100 | [diff] [blame] | 428 | } else if (!strcmp(subkey, "vcs")) { |
Daniel Barkalow | c578f51 | 2009-11-18 02:42:25 +0100 | [diff] [blame] | 429 | return git_config_string(&remote->foreign_vcs, key, value); |
Paolo Bonzini | 84bb2df | 2008-04-17 13:17:20 +0200 | [diff] [blame] | 430 | } |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 431 | return 0; |
| 432 | } |
| 433 | |
Daniel Barkalow | 55029ae | 2008-02-20 13:43:53 -0500 | [diff] [blame] | 434 | static void alias_all_urls(void) |
| 435 | { |
| 436 | int i, j; |
| 437 | for (i = 0; i < remotes_nr; i++) { |
Josh Triplett | 1c2eafb | 2009-09-07 01:56:33 -0700 | [diff] [blame] | 438 | int add_pushurl_aliases; |
Daniel Barkalow | 55029ae | 2008-02-20 13:43:53 -0500 | [diff] [blame] | 439 | if (!remotes[i]) |
| 440 | continue; |
Michael J Gruber | 2034623 | 2009-06-09 18:01:34 +0200 | [diff] [blame] | 441 | for (j = 0; j < remotes[i]->pushurl_nr; j++) { |
Josh Triplett | d071d94 | 2009-09-07 01:56:00 -0700 | [diff] [blame] | 442 | remotes[i]->pushurl[j] = alias_url(remotes[i]->pushurl[j], &rewrites); |
Michael J Gruber | 2034623 | 2009-06-09 18:01:34 +0200 | [diff] [blame] | 443 | } |
Josh Triplett | 1c2eafb | 2009-09-07 01:56:33 -0700 | [diff] [blame] | 444 | add_pushurl_aliases = remotes[i]->pushurl_nr == 0; |
| 445 | for (j = 0; j < remotes[i]->url_nr; j++) { |
| 446 | if (add_pushurl_aliases) |
| 447 | add_pushurl_alias(remotes[i], remotes[i]->url[j]); |
| 448 | remotes[i]->url[j] = alias_url(remotes[i]->url[j], &rewrites); |
| 449 | } |
Daniel Barkalow | 55029ae | 2008-02-20 13:43:53 -0500 | [diff] [blame] | 450 | } |
| 451 | } |
| 452 | |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 453 | static void read_config(void) |
| 454 | { |
Jeff King | e41bf35 | 2015-05-01 18:44:41 -0400 | [diff] [blame] | 455 | static int loaded; |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 456 | int flag; |
Jeff King | e41bf35 | 2015-05-01 18:44:41 -0400 | [diff] [blame] | 457 | |
| 458 | if (loaded) |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 459 | return; |
Jeff King | e41bf35 | 2015-05-01 18:44:41 -0400 | [diff] [blame] | 460 | loaded = 1; |
| 461 | |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 462 | current_branch = NULL; |
Jeff King | f2f12d1 | 2016-03-05 17:11:57 -0500 | [diff] [blame] | 463 | if (startup_info->have_repository) { |
René Scharfe | 744c040 | 2017-09-23 11:45:04 +0200 | [diff] [blame] | 464 | const char *head_ref = resolve_ref_unsafe("HEAD", 0, NULL, &flag); |
Jeff King | f2f12d1 | 2016-03-05 17:11:57 -0500 | [diff] [blame] | 465 | if (head_ref && (flag & REF_ISSYMREF) && |
| 466 | skip_prefix(head_ref, "refs/heads/", &head_ref)) { |
| 467 | current_branch = make_branch(head_ref, 0); |
| 468 | } |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 469 | } |
Johannes Schindelin | ef90d6d | 2008-05-14 18:46:53 +0100 | [diff] [blame] | 470 | git_config(handle_config, NULL); |
Daniel Barkalow | 55029ae | 2008-02-20 13:43:53 -0500 | [diff] [blame] | 471 | alias_all_urls(); |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 472 | } |
| 473 | |
Daniel Barkalow | df93e33 | 2008-02-15 14:14:18 -0500 | [diff] [blame] | 474 | static int valid_remote_nick(const char *name) |
| 475 | { |
Alexander Potashev | 8ca12c0 | 2009-01-10 15:07:50 +0300 | [diff] [blame] | 476 | if (!name[0] || is_dot_or_dotdot(name)) |
Daniel Barkalow | df93e33 | 2008-02-15 14:14:18 -0500 | [diff] [blame] | 477 | return 0; |
Johannes Sixt | d9244ec | 2017-05-25 14:00:13 +0200 | [diff] [blame] | 478 | |
| 479 | /* remote nicknames cannot contain slashes */ |
| 480 | while (*name) |
| 481 | if (is_dir_sep(*name++)) |
| 482 | return 0; |
| 483 | return 1; |
Daniel Barkalow | df93e33 | 2008-02-15 14:14:18 -0500 | [diff] [blame] | 484 | } |
| 485 | |
Jeff King | f052154 | 2015-05-21 00:45:16 -0400 | [diff] [blame] | 486 | const char *remote_for_branch(struct branch *branch, int *explicit) |
| 487 | { |
| 488 | if (branch && branch->remote_name) { |
| 489 | if (explicit) |
| 490 | *explicit = 1; |
| 491 | return branch->remote_name; |
| 492 | } |
| 493 | if (explicit) |
| 494 | *explicit = 0; |
| 495 | return "origin"; |
| 496 | } |
| 497 | |
Jeff King | da66b27 | 2015-05-21 00:45:20 -0400 | [diff] [blame] | 498 | const char *pushremote_for_branch(struct branch *branch, int *explicit) |
| 499 | { |
| 500 | if (branch && branch->pushremote_name) { |
| 501 | if (explicit) |
| 502 | *explicit = 1; |
| 503 | return branch->pushremote_name; |
| 504 | } |
| 505 | if (pushremote_name) { |
| 506 | if (explicit) |
| 507 | *explicit = 1; |
| 508 | return pushremote_name; |
| 509 | } |
| 510 | return remote_for_branch(branch, explicit); |
| 511 | } |
| 512 | |
J Wyman | 9700fae | 2017-11-07 17:31:08 +0100 | [diff] [blame] | 513 | const char *remote_ref_for_branch(struct branch *branch, int for_push, |
| 514 | int *explicit) |
| 515 | { |
| 516 | if (branch) { |
| 517 | if (!for_push) { |
| 518 | if (branch->merge_nr) { |
| 519 | if (explicit) |
| 520 | *explicit = 1; |
| 521 | return branch->merge_name[0]; |
| 522 | } |
| 523 | } else { |
| 524 | const char *dst, *remote_name = |
| 525 | pushremote_for_branch(branch, NULL); |
| 526 | struct remote *remote = remote_get(remote_name); |
| 527 | |
Brandon Williams | 6bdb304 | 2018-05-16 15:58:00 -0700 | [diff] [blame] | 528 | if (remote && remote->push.nr && |
Brandon Williams | d000414 | 2018-05-16 15:58:11 -0700 | [diff] [blame] | 529 | (dst = apply_refspecs(&remote->push, |
J Wyman | 9700fae | 2017-11-07 17:31:08 +0100 | [diff] [blame] | 530 | branch->refname))) { |
| 531 | if (explicit) |
| 532 | *explicit = 1; |
| 533 | return dst; |
| 534 | } |
| 535 | } |
| 536 | } |
| 537 | if (explicit) |
| 538 | *explicit = 0; |
| 539 | return ""; |
| 540 | } |
| 541 | |
Jeff King | da66b27 | 2015-05-21 00:45:20 -0400 | [diff] [blame] | 542 | static struct remote *remote_get_1(const char *name, |
| 543 | const char *(*get_default)(struct branch *, int *)) |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 544 | { |
| 545 | struct remote *ret; |
Daniel Barkalow | fa685bd | 2009-03-11 01:47:20 -0400 | [diff] [blame] | 546 | int name_given = 0; |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 547 | |
Jeff King | 8770e6f | 2015-05-21 00:45:23 -0400 | [diff] [blame] | 548 | read_config(); |
| 549 | |
Daniel Barkalow | fa685bd | 2009-03-11 01:47:20 -0400 | [diff] [blame] | 550 | if (name) |
| 551 | name_given = 1; |
Jeff King | da66b27 | 2015-05-21 00:45:20 -0400 | [diff] [blame] | 552 | else |
| 553 | name = get_default(current_branch, &name_given); |
Junio C Hamano | 9326d49 | 2009-03-16 00:35:09 -0700 | [diff] [blame] | 554 | |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 555 | ret = make_remote(name, 0); |
Jeff King | 4539c21 | 2017-02-14 15:33:28 -0500 | [diff] [blame] | 556 | if (valid_remote_nick(name) && have_git_dir()) { |
Daniel Barkalow | 0a4da29 | 2009-11-18 02:42:23 +0100 | [diff] [blame] | 557 | if (!valid_remote(ret)) |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 558 | read_remotes_file(ret); |
Daniel Barkalow | 0a4da29 | 2009-11-18 02:42:23 +0100 | [diff] [blame] | 559 | if (!valid_remote(ret)) |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 560 | read_branches_file(ret); |
| 561 | } |
Daniel Barkalow | 0a4da29 | 2009-11-18 02:42:23 +0100 | [diff] [blame] | 562 | if (name_given && !valid_remote(ret)) |
Daniel Barkalow | 55029ae | 2008-02-20 13:43:53 -0500 | [diff] [blame] | 563 | add_url_alias(ret, name); |
Daniel Barkalow | 0a4da29 | 2009-11-18 02:42:23 +0100 | [diff] [blame] | 564 | if (!valid_remote(ret)) |
Daniel Barkalow | 5751f49 | 2007-05-12 11:45:53 -0400 | [diff] [blame] | 565 | return NULL; |
| 566 | return ret; |
| 567 | } |
Daniel Barkalow | 6b62816 | 2007-05-12 11:45:59 -0400 | [diff] [blame] | 568 | |
Ramkumar Ramachandra | f24f715 | 2013-04-02 13:10:32 +0530 | [diff] [blame] | 569 | struct remote *remote_get(const char *name) |
| 570 | { |
Jeff King | da66b27 | 2015-05-21 00:45:20 -0400 | [diff] [blame] | 571 | return remote_get_1(name, remote_for_branch); |
Ramkumar Ramachandra | f24f715 | 2013-04-02 13:10:32 +0530 | [diff] [blame] | 572 | } |
| 573 | |
| 574 | struct remote *pushremote_get(const char *name) |
| 575 | { |
Jeff King | da66b27 | 2015-05-21 00:45:20 -0400 | [diff] [blame] | 576 | return remote_get_1(name, pushremote_for_branch); |
Ramkumar Ramachandra | f24f715 | 2013-04-02 13:10:32 +0530 | [diff] [blame] | 577 | } |
| 578 | |
Johannes Schindelin | e459b07 | 2017-01-19 22:20:02 +0100 | [diff] [blame] | 579 | int remote_is_configured(struct remote *remote, int in_repo) |
Finn Arne Gangstad | 9a23ba3 | 2009-04-06 15:41:01 +0200 | [diff] [blame] | 580 | { |
Johannes Schindelin | e459b07 | 2017-01-19 22:20:02 +0100 | [diff] [blame] | 581 | if (!remote) |
| 582 | return 0; |
| 583 | if (in_repo) |
| 584 | return remote->configured_in_repo; |
| 585 | return !!remote->origin; |
Finn Arne Gangstad | 9a23ba3 | 2009-04-06 15:41:01 +0200 | [diff] [blame] | 586 | } |
| 587 | |
Johannes Schindelin | b42f692 | 2007-07-10 18:48:40 +0100 | [diff] [blame] | 588 | int for_each_remote(each_remote_fn fn, void *priv) |
| 589 | { |
| 590 | int i, result = 0; |
| 591 | read_config(); |
Daniel Barkalow | 2d31347 | 2008-02-18 23:41:41 -0500 | [diff] [blame] | 592 | for (i = 0; i < remotes_nr && !result; i++) { |
Johannes Schindelin | b42f692 | 2007-07-10 18:48:40 +0100 | [diff] [blame] | 593 | struct remote *r = remotes[i]; |
| 594 | if (!r) |
| 595 | continue; |
Johannes Schindelin | b42f692 | 2007-07-10 18:48:40 +0100 | [diff] [blame] | 596 | result = fn(r, priv); |
| 597 | } |
| 598 | return result; |
| 599 | } |
| 600 | |
Michael Haggerty | df02ebd | 2013-10-30 06:33:10 +0100 | [diff] [blame] | 601 | static void handle_duplicate(struct ref *ref1, struct ref *ref2) |
| 602 | { |
Michael Haggerty | f096e6e | 2013-10-30 06:33:12 +0100 | [diff] [blame] | 603 | if (strcmp(ref1->name, ref2->name)) { |
| 604 | if (ref1->fetch_head_status != FETCH_HEAD_IGNORE && |
| 605 | ref2->fetch_head_status != FETCH_HEAD_IGNORE) { |
| 606 | die(_("Cannot fetch both %s and %s to %s"), |
| 607 | ref1->name, ref2->name, ref2->peer_ref->name); |
| 608 | } else if (ref1->fetch_head_status != FETCH_HEAD_IGNORE && |
| 609 | ref2->fetch_head_status == FETCH_HEAD_IGNORE) { |
| 610 | warning(_("%s usually tracks %s, not %s"), |
| 611 | ref2->peer_ref->name, ref2->name, ref1->name); |
| 612 | } else if (ref1->fetch_head_status == FETCH_HEAD_IGNORE && |
| 613 | ref2->fetch_head_status == FETCH_HEAD_IGNORE) { |
| 614 | die(_("%s tracks both %s and %s"), |
| 615 | ref2->peer_ref->name, ref1->name, ref2->name); |
| 616 | } else { |
| 617 | /* |
| 618 | * This last possibility doesn't occur because |
| 619 | * FETCH_HEAD_IGNORE entries always appear at |
| 620 | * the end of the list. |
| 621 | */ |
| 622 | die(_("Internal error")); |
| 623 | } |
| 624 | } |
Michael Haggerty | df02ebd | 2013-10-30 06:33:10 +0100 | [diff] [blame] | 625 | free(ref2->peer_ref); |
| 626 | free(ref2); |
| 627 | } |
| 628 | |
Michael Haggerty | b9afe66 | 2013-10-30 06:33:09 +0100 | [diff] [blame] | 629 | struct ref *ref_remove_duplicates(struct ref *ref_map) |
Daniel Barkalow | 2467a4f | 2007-10-08 00:25:07 -0400 | [diff] [blame] | 630 | { |
Thiago Farina | 183113a | 2010-07-04 16:46:19 -0300 | [diff] [blame] | 631 | struct string_list refs = STRING_LIST_INIT_NODUP; |
Michael Haggerty | b9afe66 | 2013-10-30 06:33:09 +0100 | [diff] [blame] | 632 | struct ref *retval = NULL; |
| 633 | struct ref **p = &retval; |
Julian Phillips | 73cf082 | 2009-10-25 21:28:11 +0000 | [diff] [blame] | 634 | |
Michael Haggerty | b9afe66 | 2013-10-30 06:33:09 +0100 | [diff] [blame] | 635 | while (ref_map) { |
| 636 | struct ref *ref = ref_map; |
Julian Phillips | 73cf082 | 2009-10-25 21:28:11 +0000 | [diff] [blame] | 637 | |
Michael Haggerty | b9afe66 | 2013-10-30 06:33:09 +0100 | [diff] [blame] | 638 | ref_map = ref_map->next; |
| 639 | ref->next = NULL; |
| 640 | |
| 641 | if (!ref->peer_ref) { |
| 642 | *p = ref; |
| 643 | p = &ref->next; |
Michael Haggerty | 09ea1f8 | 2013-10-30 06:33:07 +0100 | [diff] [blame] | 644 | } else { |
Michael Haggerty | b9afe66 | 2013-10-30 06:33:09 +0100 | [diff] [blame] | 645 | struct string_list_item *item = |
| 646 | string_list_insert(&refs, ref->peer_ref->name); |
| 647 | |
| 648 | if (item->util) { |
| 649 | /* Entry already existed */ |
Michael Haggerty | df02ebd | 2013-10-30 06:33:10 +0100 | [diff] [blame] | 650 | handle_duplicate((struct ref *)item->util, ref); |
Michael Haggerty | b9afe66 | 2013-10-30 06:33:09 +0100 | [diff] [blame] | 651 | } else { |
| 652 | *p = ref; |
| 653 | p = &ref->next; |
| 654 | item->util = ref; |
| 655 | } |
Daniel Barkalow | 2467a4f | 2007-10-08 00:25:07 -0400 | [diff] [blame] | 656 | } |
| 657 | } |
Michael Haggerty | b9afe66 | 2013-10-30 06:33:09 +0100 | [diff] [blame] | 658 | |
Julian Phillips | 73cf082 | 2009-10-25 21:28:11 +0000 | [diff] [blame] | 659 | string_list_clear(&refs, 0); |
Michael Haggerty | b9afe66 | 2013-10-30 06:33:09 +0100 | [diff] [blame] | 660 | return retval; |
Daniel Barkalow | 2467a4f | 2007-10-08 00:25:07 -0400 | [diff] [blame] | 661 | } |
| 662 | |
Shawn O. Pearce | 28b91f8 | 2007-09-19 00:49:27 -0400 | [diff] [blame] | 663 | int remote_has_url(struct remote *remote, const char *url) |
Daniel Barkalow | 5d46c9d | 2007-05-12 11:46:03 -0400 | [diff] [blame] | 664 | { |
| 665 | int i; |
Shawn O. Pearce | 28b91f8 | 2007-09-19 00:49:27 -0400 | [diff] [blame] | 666 | for (i = 0; i < remote->url_nr; i++) { |
| 667 | if (!strcmp(remote->url[i], url)) |
Daniel Barkalow | 5d46c9d | 2007-05-12 11:46:03 -0400 | [diff] [blame] | 668 | return 1; |
| 669 | } |
| 670 | return 0; |
| 671 | } |
| 672 | |
Daniel Barkalow | e928213 | 2009-03-07 01:11:34 -0500 | [diff] [blame] | 673 | static int match_name_with_pattern(const char *key, const char *name, |
| 674 | const char *value, char **result) |
Daniel Barkalow | a3c8423 | 2009-03-07 01:11:29 -0500 | [diff] [blame] | 675 | { |
Daniel Barkalow | 08fbdb3 | 2009-03-07 01:11:36 -0500 | [diff] [blame] | 676 | const char *kstar = strchr(key, '*'); |
| 677 | size_t klen; |
Daniel Barkalow | abd2bde | 2009-03-07 01:11:39 -0500 | [diff] [blame] | 678 | size_t ksuffixlen; |
| 679 | size_t namelen; |
Daniel Barkalow | 08fbdb3 | 2009-03-07 01:11:36 -0500 | [diff] [blame] | 680 | int ret; |
| 681 | if (!kstar) |
| 682 | die("Key '%s' of pattern had no '*'", key); |
| 683 | klen = kstar - key; |
Daniel Barkalow | abd2bde | 2009-03-07 01:11:39 -0500 | [diff] [blame] | 684 | ksuffixlen = strlen(kstar + 1); |
| 685 | namelen = strlen(name); |
| 686 | ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen && |
| 687 | !memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen); |
Daniel Barkalow | e928213 | 2009-03-07 01:11:34 -0500 | [diff] [blame] | 688 | if (ret && value) { |
René Scharfe | 07bfa57 | 2014-09-21 10:23:37 +0200 | [diff] [blame] | 689 | struct strbuf sb = STRBUF_INIT; |
Daniel Barkalow | 08fbdb3 | 2009-03-07 01:11:36 -0500 | [diff] [blame] | 690 | const char *vstar = strchr(value, '*'); |
Daniel Barkalow | 08fbdb3 | 2009-03-07 01:11:36 -0500 | [diff] [blame] | 691 | if (!vstar) |
| 692 | die("Value '%s' of pattern has no '*'", value); |
René Scharfe | 07bfa57 | 2014-09-21 10:23:37 +0200 | [diff] [blame] | 693 | strbuf_add(&sb, value, vstar - value); |
| 694 | strbuf_add(&sb, name + klen, namelen - klen - ksuffixlen); |
| 695 | strbuf_addstr(&sb, vstar + 1); |
| 696 | *result = strbuf_detach(&sb, NULL); |
Daniel Barkalow | e928213 | 2009-03-07 01:11:34 -0500 | [diff] [blame] | 697 | } |
Daniel Barkalow | a3c8423 | 2009-03-07 01:11:29 -0500 | [diff] [blame] | 698 | return ret; |
| 699 | } |
| 700 | |
Brandon Williams | a2ac50c | 2018-05-16 15:58:10 -0700 | [diff] [blame] | 701 | static void query_refspecs_multiple(struct refspec *rs, |
| 702 | struct refspec_item *query, |
| 703 | struct string_list *results) |
Carlos Martín Nieto | e6f6371 | 2014-02-27 10:00:10 +0100 | [diff] [blame] | 704 | { |
| 705 | int i; |
| 706 | int find_src = !query->src; |
| 707 | |
| 708 | if (find_src && !query->dst) |
| 709 | error("query_refspecs_multiple: need either src or dst"); |
| 710 | |
Brandon Williams | a2ac50c | 2018-05-16 15:58:10 -0700 | [diff] [blame] | 711 | for (i = 0; i < rs->nr; i++) { |
| 712 | struct refspec_item *refspec = &rs->items[i]; |
Carlos Martín Nieto | e6f6371 | 2014-02-27 10:00:10 +0100 | [diff] [blame] | 713 | const char *key = find_src ? refspec->dst : refspec->src; |
| 714 | const char *value = find_src ? refspec->src : refspec->dst; |
| 715 | const char *needle = find_src ? query->dst : query->src; |
| 716 | char **result = find_src ? &query->src : &query->dst; |
| 717 | |
| 718 | if (!refspec->dst) |
| 719 | continue; |
| 720 | if (refspec->pattern) { |
| 721 | if (match_name_with_pattern(key, needle, value, result)) |
| 722 | string_list_append_nodup(results, *result); |
| 723 | } else if (!strcmp(needle, key)) { |
| 724 | string_list_append(results, value); |
| 725 | } |
| 726 | } |
| 727 | } |
| 728 | |
Brandon Williams | 86baf82 | 2018-05-16 15:58:12 -0700 | [diff] [blame] | 729 | int query_refspecs(struct refspec *rs, struct refspec_item *query) |
Daniel Barkalow | 72ff894 | 2009-11-18 02:42:28 +0100 | [diff] [blame] | 730 | { |
| 731 | int i; |
Carlos Martín Nieto | c500352 | 2011-10-15 07:04:24 +0200 | [diff] [blame] | 732 | int find_src = !query->src; |
Michael Haggerty | 049bff8 | 2013-10-30 06:33:01 +0100 | [diff] [blame] | 733 | const char *needle = find_src ? query->dst : query->src; |
| 734 | char **result = find_src ? &query->src : &query->dst; |
Daniel Barkalow | 72ff894 | 2009-11-18 02:42:28 +0100 | [diff] [blame] | 735 | |
Carlos Martín Nieto | c500352 | 2011-10-15 07:04:24 +0200 | [diff] [blame] | 736 | if (find_src && !query->dst) |
| 737 | return error("query_refspecs: need either src or dst"); |
Johannes Schindelin | b42f692 | 2007-07-10 18:48:40 +0100 | [diff] [blame] | 738 | |
Brandon Williams | 86baf82 | 2018-05-16 15:58:12 -0700 | [diff] [blame] | 739 | for (i = 0; i < rs->nr; i++) { |
| 740 | struct refspec_item *refspec = &rs->items[i]; |
Carlos Martín Nieto | c500352 | 2011-10-15 07:04:24 +0200 | [diff] [blame] | 741 | const char *key = find_src ? refspec->dst : refspec->src; |
| 742 | const char *value = find_src ? refspec->src : refspec->dst; |
Carlos Martín Nieto | c500352 | 2011-10-15 07:04:24 +0200 | [diff] [blame] | 743 | |
Shawn O. Pearce | 009c5bc | 2007-09-25 00:13:14 -0400 | [diff] [blame] | 744 | if (!refspec->dst) |
Daniel Barkalow | 5d46c9d | 2007-05-12 11:46:03 -0400 | [diff] [blame] | 745 | continue; |
Carlos Martín Nieto | c500352 | 2011-10-15 07:04:24 +0200 | [diff] [blame] | 746 | if (refspec->pattern) { |
Daniel Barkalow | e928213 | 2009-03-07 01:11:34 -0500 | [diff] [blame] | 747 | if (match_name_with_pattern(key, needle, value, result)) { |
Carlos Martín Nieto | c500352 | 2011-10-15 07:04:24 +0200 | [diff] [blame] | 748 | query->force = refspec->force; |
Daniel Barkalow | 5d46c9d | 2007-05-12 11:46:03 -0400 | [diff] [blame] | 749 | return 0; |
| 750 | } |
Johannes Schindelin | b42f692 | 2007-07-10 18:48:40 +0100 | [diff] [blame] | 751 | } else if (!strcmp(needle, key)) { |
| 752 | *result = xstrdup(value); |
Carlos Martín Nieto | c500352 | 2011-10-15 07:04:24 +0200 | [diff] [blame] | 753 | query->force = refspec->force; |
Johannes Schindelin | b42f692 | 2007-07-10 18:48:40 +0100 | [diff] [blame] | 754 | return 0; |
Daniel Barkalow | 5d46c9d | 2007-05-12 11:46:03 -0400 | [diff] [blame] | 755 | } |
| 756 | } |
Daniel Barkalow | 5d46c9d | 2007-05-12 11:46:03 -0400 | [diff] [blame] | 757 | return -1; |
| 758 | } |
| 759 | |
Brandon Williams | d000414 | 2018-05-16 15:58:11 -0700 | [diff] [blame] | 760 | char *apply_refspecs(struct refspec *rs, const char *name) |
Carlos Martín Nieto | c500352 | 2011-10-15 07:04:24 +0200 | [diff] [blame] | 761 | { |
Brandon Williams | 0ad4a5f | 2018-05-16 15:57:49 -0700 | [diff] [blame] | 762 | struct refspec_item query; |
Carlos Martín Nieto | c500352 | 2011-10-15 07:04:24 +0200 | [diff] [blame] | 763 | |
Brandon Williams | 0ad4a5f | 2018-05-16 15:57:49 -0700 | [diff] [blame] | 764 | memset(&query, 0, sizeof(struct refspec_item)); |
Carlos Martín Nieto | c500352 | 2011-10-15 07:04:24 +0200 | [diff] [blame] | 765 | query.src = (char *)name; |
| 766 | |
Brandon Williams | 86baf82 | 2018-05-16 15:58:12 -0700 | [diff] [blame] | 767 | if (query_refspecs(rs, &query)) |
Carlos Martín Nieto | c500352 | 2011-10-15 07:04:24 +0200 | [diff] [blame] | 768 | return NULL; |
| 769 | |
| 770 | return query.dst; |
| 771 | } |
| 772 | |
Brandon Williams | 0ad4a5f | 2018-05-16 15:57:49 -0700 | [diff] [blame] | 773 | int remote_find_tracking(struct remote *remote, struct refspec_item *refspec) |
Carlos Martín Nieto | c500352 | 2011-10-15 07:04:24 +0200 | [diff] [blame] | 774 | { |
Brandon Williams | 86baf82 | 2018-05-16 15:58:12 -0700 | [diff] [blame] | 775 | return query_refspecs(&remote->fetch, refspec); |
Carlos Martín Nieto | c500352 | 2011-10-15 07:04:24 +0200 | [diff] [blame] | 776 | } |
| 777 | |
René Scharfe | 8009768 | 2008-10-18 10:37:40 +0200 | [diff] [blame] | 778 | static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen, |
| 779 | const char *name) |
| 780 | { |
| 781 | size_t len = strlen(name); |
Jeff King | 50a6c8e | 2016-02-22 17:44:35 -0500 | [diff] [blame] | 782 | struct ref *ref = xcalloc(1, st_add4(sizeof(*ref), prefixlen, len, 1)); |
René Scharfe | 8009768 | 2008-10-18 10:37:40 +0200 | [diff] [blame] | 783 | memcpy(ref->name, prefix, prefixlen); |
| 784 | memcpy(ref->name + prefixlen, name, len); |
| 785 | return ref; |
| 786 | } |
| 787 | |
René Scharfe | 59c69c0 | 2008-10-18 10:44:18 +0200 | [diff] [blame] | 788 | struct ref *alloc_ref(const char *name) |
Daniel Barkalow | dfd255d | 2007-07-10 00:47:23 -0400 | [diff] [blame] | 789 | { |
René Scharfe | 59c69c0 | 2008-10-18 10:44:18 +0200 | [diff] [blame] | 790 | return alloc_ref_with_prefix("", 0, name); |
Krzysztof Kowalczyk | 737922a | 2008-05-10 16:26:58 -0700 | [diff] [blame] | 791 | } |
| 792 | |
Jeff King | 59a5775 | 2011-06-07 19:03:03 -0400 | [diff] [blame] | 793 | struct ref *copy_ref(const struct ref *ref) |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 794 | { |
Jay Soffian | 7b3db09 | 2009-02-27 14:10:04 -0500 | [diff] [blame] | 795 | struct ref *cpy; |
| 796 | size_t len; |
| 797 | if (!ref) |
| 798 | return NULL; |
Jeff King | 50a6c8e | 2016-02-22 17:44:35 -0500 | [diff] [blame] | 799 | len = st_add3(sizeof(struct ref), strlen(ref->name), 1); |
| 800 | cpy = xmalloc(len); |
| 801 | memcpy(cpy, ref, len); |
Jay Soffian | 7b3db09 | 2009-02-27 14:10:04 -0500 | [diff] [blame] | 802 | cpy->next = NULL; |
Jeff King | 8c53f07 | 2015-01-12 20:59:09 -0500 | [diff] [blame] | 803 | cpy->symref = xstrdup_or_null(ref->symref); |
| 804 | cpy->remote_status = xstrdup_or_null(ref->remote_status); |
Jay Soffian | 7b3db09 | 2009-02-27 14:10:04 -0500 | [diff] [blame] | 805 | cpy->peer_ref = copy_ref(ref->peer_ref); |
| 806 | return cpy; |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 807 | } |
| 808 | |
Daniel Barkalow | 4577370 | 2007-10-29 21:05:40 -0400 | [diff] [blame] | 809 | struct ref *copy_ref_list(const struct ref *ref) |
| 810 | { |
| 811 | struct ref *ret = NULL; |
| 812 | struct ref **tail = &ret; |
| 813 | while (ref) { |
| 814 | *tail = copy_ref(ref); |
| 815 | ref = ref->next; |
| 816 | tail = &((*tail)->next); |
| 817 | } |
| 818 | return ret; |
| 819 | } |
| 820 | |
Nanako Shiraishi | 697d7f5 | 2008-09-25 18:41:00 +0900 | [diff] [blame] | 821 | static void free_ref(struct ref *ref) |
Daniel Barkalow | be885d9 | 2008-04-26 15:53:12 -0400 | [diff] [blame] | 822 | { |
| 823 | if (!ref) |
| 824 | return; |
Jay Soffian | 7b3db09 | 2009-02-27 14:10:04 -0500 | [diff] [blame] | 825 | free_ref(ref->peer_ref); |
Daniel Barkalow | be885d9 | 2008-04-26 15:53:12 -0400 | [diff] [blame] | 826 | free(ref->remote_status); |
| 827 | free(ref->symref); |
| 828 | free(ref); |
| 829 | } |
| 830 | |
Daniel Barkalow | dfd255d | 2007-07-10 00:47:23 -0400 | [diff] [blame] | 831 | void free_refs(struct ref *ref) |
| 832 | { |
| 833 | struct ref *next; |
| 834 | while (ref) { |
| 835 | next = ref->next; |
Daniel Barkalow | be885d9 | 2008-04-26 15:53:12 -0400 | [diff] [blame] | 836 | free_ref(ref); |
Daniel Barkalow | dfd255d | 2007-07-10 00:47:23 -0400 | [diff] [blame] | 837 | ref = next; |
| 838 | } |
| 839 | } |
| 840 | |
Jeff King | ed81c76 | 2012-05-21 18:19:28 -0400 | [diff] [blame] | 841 | int ref_compare_name(const void *va, const void *vb) |
| 842 | { |
| 843 | const struct ref *a = va, *b = vb; |
| 844 | return strcmp(a->name, b->name); |
| 845 | } |
| 846 | |
| 847 | static void *ref_list_get_next(const void *a) |
| 848 | { |
| 849 | return ((const struct ref *)a)->next; |
| 850 | } |
| 851 | |
| 852 | static void ref_list_set_next(void *a, void *next) |
| 853 | { |
| 854 | ((struct ref *)a)->next = next; |
| 855 | } |
| 856 | |
| 857 | void sort_ref_list(struct ref **l, int (*cmp)(const void *, const void *)) |
| 858 | { |
| 859 | *l = llist_mergesort(*l, ref_list_get_next, ref_list_set_next, cmp); |
| 860 | } |
| 861 | |
Junio C Hamano | ca02465 | 2013-12-03 15:41:15 -0800 | [diff] [blame] | 862 | int count_refspec_match(const char *pattern, |
| 863 | struct ref *refs, |
| 864 | struct ref **matched_ref) |
Daniel Barkalow | 6b62816 | 2007-05-12 11:45:59 -0400 | [diff] [blame] | 865 | { |
| 866 | int patlen = strlen(pattern); |
| 867 | struct ref *matched_weak = NULL; |
| 868 | struct ref *matched = NULL; |
| 869 | int weak_match = 0; |
| 870 | int match = 0; |
| 871 | |
| 872 | for (weak_match = match = 0; refs; refs = refs->next) { |
| 873 | char *name = refs->name; |
| 874 | int namelen = strlen(name); |
Daniel Barkalow | 6b62816 | 2007-05-12 11:45:59 -0400 | [diff] [blame] | 875 | |
Michael Haggerty | 54457fe | 2014-01-14 04:16:07 +0100 | [diff] [blame] | 876 | if (!refname_match(pattern, name)) |
Daniel Barkalow | 6b62816 | 2007-05-12 11:45:59 -0400 | [diff] [blame] | 877 | continue; |
| 878 | |
| 879 | /* A match is "weak" if it is with refs outside |
| 880 | * heads or tags, and did not specify the pattern |
| 881 | * in full (e.g. "refs/remotes/origin/master") or at |
| 882 | * least from the toplevel (e.g. "remotes/origin/master"); |
| 883 | * otherwise "git push $URL master" would result in |
| 884 | * ambiguity between remotes/origin/master and heads/master |
| 885 | * at the remote site. |
| 886 | */ |
| 887 | if (namelen != patlen && |
| 888 | patlen != namelen - 5 && |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 889 | !starts_with(name, "refs/heads/") && |
| 890 | !starts_with(name, "refs/tags/")) { |
Daniel Barkalow | 6b62816 | 2007-05-12 11:45:59 -0400 | [diff] [blame] | 891 | /* We want to catch the case where only weak |
| 892 | * matches are found and there are multiple |
| 893 | * matches, and where more than one strong |
| 894 | * matches are found, as ambiguous. One |
| 895 | * strong match with zero or more weak matches |
| 896 | * are acceptable as a unique match. |
| 897 | */ |
| 898 | matched_weak = refs; |
| 899 | weak_match++; |
| 900 | } |
| 901 | else { |
| 902 | matched = refs; |
| 903 | match++; |
| 904 | } |
| 905 | } |
| 906 | if (!matched) { |
Jeff King | 471fd3f | 2014-03-05 14:03:43 -0500 | [diff] [blame] | 907 | if (matched_ref) |
| 908 | *matched_ref = matched_weak; |
Daniel Barkalow | 6b62816 | 2007-05-12 11:45:59 -0400 | [diff] [blame] | 909 | return weak_match; |
| 910 | } |
| 911 | else { |
Jeff King | 471fd3f | 2014-03-05 14:03:43 -0500 | [diff] [blame] | 912 | if (matched_ref) |
| 913 | *matched_ref = matched; |
Daniel Barkalow | 6b62816 | 2007-05-12 11:45:59 -0400 | [diff] [blame] | 914 | return match; |
| 915 | } |
| 916 | } |
| 917 | |
Daniel Barkalow | 1d73526 | 2007-07-10 00:47:26 -0400 | [diff] [blame] | 918 | static void tail_link_ref(struct ref *ref, struct ref ***tail) |
Daniel Barkalow | 6b62816 | 2007-05-12 11:45:59 -0400 | [diff] [blame] | 919 | { |
| 920 | **tail = ref; |
Daniel Barkalow | 1d73526 | 2007-07-10 00:47:26 -0400 | [diff] [blame] | 921 | while (ref->next) |
| 922 | ref = ref->next; |
Daniel Barkalow | 6b62816 | 2007-05-12 11:45:59 -0400 | [diff] [blame] | 923 | *tail = &ref->next; |
Daniel Barkalow | 6b62816 | 2007-05-12 11:45:59 -0400 | [diff] [blame] | 924 | } |
| 925 | |
Felipe Contreras | 6765524 | 2012-02-23 00:43:40 +0200 | [diff] [blame] | 926 | static struct ref *alloc_delete_ref(void) |
| 927 | { |
| 928 | struct ref *ref = alloc_ref("(delete)"); |
brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 +0000 | [diff] [blame] | 929 | oidclr(&ref->new_oid); |
Felipe Contreras | 6765524 | 2012-02-23 00:43:40 +0200 | [diff] [blame] | 930 | return ref; |
| 931 | } |
| 932 | |
Jeff King | 471fd3f | 2014-03-05 14:03:43 -0500 | [diff] [blame] | 933 | static int try_explicit_object_name(const char *name, |
| 934 | struct ref **match) |
Daniel Barkalow | 6b62816 | 2007-05-12 11:45:59 -0400 | [diff] [blame] | 935 | { |
brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 +0000 | [diff] [blame] | 936 | struct object_id oid; |
Daniel Barkalow | 6b62816 | 2007-05-12 11:45:59 -0400 | [diff] [blame] | 937 | |
Jeff King | 471fd3f | 2014-03-05 14:03:43 -0500 | [diff] [blame] | 938 | if (!*name) { |
| 939 | if (match) |
| 940 | *match = alloc_delete_ref(); |
| 941 | return 0; |
| 942 | } |
| 943 | |
brian m. carlson | e82caf3 | 2017-07-13 23:49:28 +0000 | [diff] [blame] | 944 | if (get_oid(name, &oid)) |
Jeff King | 471fd3f | 2014-03-05 14:03:43 -0500 | [diff] [blame] | 945 | return -1; |
| 946 | |
| 947 | if (match) { |
| 948 | *match = alloc_ref(name); |
brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 +0000 | [diff] [blame] | 949 | oidcpy(&(*match)->new_oid, &oid); |
Jeff King | 471fd3f | 2014-03-05 14:03:43 -0500 | [diff] [blame] | 950 | } |
| 951 | return 0; |
Daniel Barkalow | 6b62816 | 2007-05-12 11:45:59 -0400 | [diff] [blame] | 952 | } |
| 953 | |
Daniel Barkalow | 1d73526 | 2007-07-10 00:47:26 -0400 | [diff] [blame] | 954 | static struct ref *make_linked_ref(const char *name, struct ref ***tail) |
Junio C Hamano | 163f0ee | 2007-06-09 00:07:34 -0700 | [diff] [blame] | 955 | { |
René Scharfe | 59c69c0 | 2008-10-18 10:44:18 +0200 | [diff] [blame] | 956 | struct ref *ret = alloc_ref(name); |
Daniel Barkalow | 1d73526 | 2007-07-10 00:47:26 -0400 | [diff] [blame] | 957 | tail_link_ref(ret, tail); |
| 958 | return ret; |
Junio C Hamano | 163f0ee | 2007-06-09 00:07:34 -0700 | [diff] [blame] | 959 | } |
| 960 | |
Jeff King | f8aae12 | 2008-04-23 05:16:06 -0400 | [diff] [blame] | 961 | static char *guess_ref(const char *name, struct ref *peer) |
| 962 | { |
| 963 | struct strbuf buf = STRBUF_INIT; |
Jeff King | f8aae12 | 2008-04-23 05:16:06 -0400 | [diff] [blame] | 964 | |
Ronnie Sahlberg | 7695d11 | 2014-07-15 12:59:36 -0700 | [diff] [blame] | 965 | const char *r = resolve_ref_unsafe(peer->name, RESOLVE_REF_READING, |
René Scharfe | 744c040 | 2017-09-23 11:45:04 +0200 | [diff] [blame] | 966 | NULL, NULL); |
Jeff King | f8aae12 | 2008-04-23 05:16:06 -0400 | [diff] [blame] | 967 | if (!r) |
| 968 | return NULL; |
| 969 | |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 970 | if (starts_with(r, "refs/heads/")) |
Jeff King | f8aae12 | 2008-04-23 05:16:06 -0400 | [diff] [blame] | 971 | strbuf_addstr(&buf, "refs/heads/"); |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 972 | else if (starts_with(r, "refs/tags/")) |
Jeff King | f8aae12 | 2008-04-23 05:16:06 -0400 | [diff] [blame] | 973 | strbuf_addstr(&buf, "refs/tags/"); |
| 974 | else |
| 975 | return NULL; |
| 976 | |
| 977 | strbuf_addstr(&buf, name); |
| 978 | return strbuf_detach(&buf, NULL); |
| 979 | } |
| 980 | |
Jeff King | f7ade3d | 2014-03-05 14:03:21 -0500 | [diff] [blame] | 981 | static int match_explicit_lhs(struct ref *src, |
Brandon Williams | 0ad4a5f | 2018-05-16 15:57:49 -0700 | [diff] [blame] | 982 | struct refspec_item *rs, |
Jeff King | f7ade3d | 2014-03-05 14:03:21 -0500 | [diff] [blame] | 983 | struct ref **match, |
| 984 | int *allocated_match) |
| 985 | { |
| 986 | switch (count_refspec_match(rs->src, src, match)) { |
| 987 | case 1: |
Jeff King | 471fd3f | 2014-03-05 14:03:43 -0500 | [diff] [blame] | 988 | if (allocated_match) |
| 989 | *allocated_match = 0; |
Jeff King | f7ade3d | 2014-03-05 14:03:21 -0500 | [diff] [blame] | 990 | return 0; |
| 991 | case 0: |
| 992 | /* The source could be in the get_sha1() format |
| 993 | * not a reference name. :refs/other is a |
| 994 | * way to delete 'other' ref at the remote end. |
| 995 | */ |
Jeff King | 471fd3f | 2014-03-05 14:03:43 -0500 | [diff] [blame] | 996 | if (try_explicit_object_name(rs->src, match) < 0) |
Jeff King | f7ade3d | 2014-03-05 14:03:21 -0500 | [diff] [blame] | 997 | return error("src refspec %s does not match any.", rs->src); |
Jeff King | 471fd3f | 2014-03-05 14:03:43 -0500 | [diff] [blame] | 998 | if (allocated_match) |
| 999 | *allocated_match = 1; |
Jeff King | f7ade3d | 2014-03-05 14:03:21 -0500 | [diff] [blame] | 1000 | return 0; |
| 1001 | default: |
| 1002 | return error("src refspec %s matches more than one.", rs->src); |
| 1003 | } |
| 1004 | } |
| 1005 | |
Junio C Hamano | 54a8ad9 | 2007-06-08 23:22:58 -0700 | [diff] [blame] | 1006 | static int match_explicit(struct ref *src, struct ref *dst, |
| 1007 | struct ref ***dst_tail, |
Brandon Williams | 0ad4a5f | 2018-05-16 15:57:49 -0700 | [diff] [blame] | 1008 | struct refspec_item *rs) |
Junio C Hamano | 54a8ad9 | 2007-06-08 23:22:58 -0700 | [diff] [blame] | 1009 | { |
| 1010 | struct ref *matched_src, *matched_dst; |
Jeff King | f7ade3d | 2014-03-05 14:03:21 -0500 | [diff] [blame] | 1011 | int allocated_src; |
Junio C Hamano | 54a8ad9 | 2007-06-08 23:22:58 -0700 | [diff] [blame] | 1012 | |
| 1013 | const char *dst_value = rs->dst; |
Jeff King | f8aae12 | 2008-04-23 05:16:06 -0400 | [diff] [blame] | 1014 | char *dst_guess; |
Junio C Hamano | 54a8ad9 | 2007-06-08 23:22:58 -0700 | [diff] [blame] | 1015 | |
Paolo Bonzini | a83619d | 2008-04-28 11:32:12 -0400 | [diff] [blame] | 1016 | if (rs->pattern || rs->matching) |
Jeff King | 9a7bbd1 | 2008-06-16 12:15:02 -0400 | [diff] [blame] | 1017 | return 0; |
Junio C Hamano | 54a8ad9 | 2007-06-08 23:22:58 -0700 | [diff] [blame] | 1018 | |
Junio C Hamano | 54a8ad9 | 2007-06-08 23:22:58 -0700 | [diff] [blame] | 1019 | matched_src = matched_dst = NULL; |
Jeff King | f7ade3d | 2014-03-05 14:03:21 -0500 | [diff] [blame] | 1020 | if (match_explicit_lhs(src, rs, &matched_src, &allocated_src) < 0) |
| 1021 | return -1; |
Junio C Hamano | 3c8b7df | 2007-06-09 00:14:04 -0700 | [diff] [blame] | 1022 | |
Shawn O. Pearce | 4491e62 | 2007-09-25 00:13:25 -0400 | [diff] [blame] | 1023 | if (!dst_value) { |
Daniel Barkalow | 9f0ea7e | 2008-02-20 12:54:05 -0500 | [diff] [blame] | 1024 | int flag; |
| 1025 | |
Ronnie Sahlberg | 7695d11 | 2014-07-15 12:59:36 -0700 | [diff] [blame] | 1026 | dst_value = resolve_ref_unsafe(matched_src->name, |
| 1027 | RESOLVE_REF_READING, |
René Scharfe | 744c040 | 2017-09-23 11:45:04 +0200 | [diff] [blame] | 1028 | NULL, &flag); |
Daniel Barkalow | 9f0ea7e | 2008-02-20 12:54:05 -0500 | [diff] [blame] | 1029 | if (!dst_value || |
| 1030 | ((flag & REF_ISSYMREF) && |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 1031 | !starts_with(dst_value, "refs/heads/"))) |
Daniel Barkalow | 9f0ea7e | 2008-02-20 12:54:05 -0500 | [diff] [blame] | 1032 | die("%s cannot be resolved to branch.", |
| 1033 | matched_src->name); |
Shawn O. Pearce | 4491e62 | 2007-09-25 00:13:25 -0400 | [diff] [blame] | 1034 | } |
Junio C Hamano | 3c8b7df | 2007-06-09 00:14:04 -0700 | [diff] [blame] | 1035 | |
Junio C Hamano | 54a8ad9 | 2007-06-08 23:22:58 -0700 | [diff] [blame] | 1036 | switch (count_refspec_match(dst_value, dst, &matched_dst)) { |
| 1037 | case 1: |
| 1038 | break; |
| 1039 | case 0: |
René Scharfe | 50e19a8 | 2014-06-06 19:24:48 +0200 | [diff] [blame] | 1040 | if (starts_with(dst_value, "refs/")) |
Daniel Barkalow | 1d73526 | 2007-07-10 00:47:26 -0400 | [diff] [blame] | 1041 | matched_dst = make_linked_ref(dst_value, dst_tail); |
brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 +0000 | [diff] [blame] | 1042 | else if (is_null_oid(&matched_src->new_oid)) |
Jeff King | 5742c82 | 2012-07-03 14:04:39 -0400 | [diff] [blame] | 1043 | error("unable to delete '%s': remote ref does not exist", |
| 1044 | dst_value); |
Johannes Schindelin | 3dc7ea9 | 2017-05-04 15:59:01 +0200 | [diff] [blame] | 1045 | else if ((dst_guess = guess_ref(dst_value, matched_src))) { |
Jeff King | f8aae12 | 2008-04-23 05:16:06 -0400 | [diff] [blame] | 1046 | matched_dst = make_linked_ref(dst_guess, dst_tail); |
Johannes Schindelin | 3dc7ea9 | 2017-05-04 15:59:01 +0200 | [diff] [blame] | 1047 | free(dst_guess); |
| 1048 | } else |
Jeff King | f8aae12 | 2008-04-23 05:16:06 -0400 | [diff] [blame] | 1049 | error("unable to push to unqualified destination: %s\n" |
| 1050 | "The destination refspec neither matches an " |
| 1051 | "existing ref on the remote nor\n" |
| 1052 | "begins with refs/, and we are unable to " |
| 1053 | "guess a prefix based on the source ref.", |
| 1054 | dst_value); |
Junio C Hamano | 54a8ad9 | 2007-06-08 23:22:58 -0700 | [diff] [blame] | 1055 | break; |
| 1056 | default: |
Junio C Hamano | 3c8b7df | 2007-06-09 00:14:04 -0700 | [diff] [blame] | 1057 | matched_dst = NULL; |
Junio C Hamano | 54a8ad9 | 2007-06-08 23:22:58 -0700 | [diff] [blame] | 1058 | error("dst refspec %s matches more than one.", |
| 1059 | dst_value); |
| 1060 | break; |
| 1061 | } |
Jeff King | 9a7bbd1 | 2008-06-16 12:15:02 -0400 | [diff] [blame] | 1062 | if (!matched_dst) |
| 1063 | return -1; |
| 1064 | if (matched_dst->peer_ref) |
| 1065 | return error("dst ref %s receives from more than one src.", |
Junio C Hamano | 54a8ad9 | 2007-06-08 23:22:58 -0700 | [diff] [blame] | 1066 | matched_dst->name); |
Junio C Hamano | 54a8ad9 | 2007-06-08 23:22:58 -0700 | [diff] [blame] | 1067 | else { |
Jeff King | f7ade3d | 2014-03-05 14:03:21 -0500 | [diff] [blame] | 1068 | matched_dst->peer_ref = allocated_src ? |
| 1069 | matched_src : |
| 1070 | copy_ref(matched_src); |
Junio C Hamano | 54a8ad9 | 2007-06-08 23:22:58 -0700 | [diff] [blame] | 1071 | matched_dst->force = rs->force; |
| 1072 | } |
Jeff King | 9a7bbd1 | 2008-06-16 12:15:02 -0400 | [diff] [blame] | 1073 | return 0; |
Junio C Hamano | 54a8ad9 | 2007-06-08 23:22:58 -0700 | [diff] [blame] | 1074 | } |
| 1075 | |
Daniel Barkalow | 6b62816 | 2007-05-12 11:45:59 -0400 | [diff] [blame] | 1076 | static int match_explicit_refs(struct ref *src, struct ref *dst, |
Brandon Williams | 9fa2e5e | 2018-05-16 15:58:14 -0700 | [diff] [blame] | 1077 | struct ref ***dst_tail, struct refspec *rs) |
Daniel Barkalow | 6b62816 | 2007-05-12 11:45:59 -0400 | [diff] [blame] | 1078 | { |
| 1079 | int i, errs; |
Brandon Williams | 9fa2e5e | 2018-05-16 15:58:14 -0700 | [diff] [blame] | 1080 | for (i = errs = 0; i < rs->nr; i++) |
| 1081 | errs += match_explicit(src, dst, dst_tail, &rs->items[i]); |
Jeff King | 9a7bbd1 | 2008-06-16 12:15:02 -0400 | [diff] [blame] | 1082 | return errs; |
Daniel Barkalow | 6b62816 | 2007-05-12 11:45:59 -0400 | [diff] [blame] | 1083 | } |
| 1084 | |
Brandon Williams | f3acb83 | 2018-05-16 15:58:13 -0700 | [diff] [blame] | 1085 | static char *get_ref_match(const struct refspec *rs, const struct ref *ref, |
| 1086 | int send_mirror, int direction, |
| 1087 | const struct refspec_item **ret_pat) |
Daniel Barkalow | 8558fd9 | 2007-05-25 01:20:56 -0400 | [diff] [blame] | 1088 | { |
Brandon Williams | 0ad4a5f | 2018-05-16 15:57:49 -0700 | [diff] [blame] | 1089 | const struct refspec_item *pat; |
Felipe Contreras | db70a04 | 2012-02-23 00:43:39 +0200 | [diff] [blame] | 1090 | char *name; |
Daniel Barkalow | 8558fd9 | 2007-05-25 01:20:56 -0400 | [diff] [blame] | 1091 | int i; |
Paolo Bonzini | a83619d | 2008-04-28 11:32:12 -0400 | [diff] [blame] | 1092 | int matching_refs = -1; |
Brandon Williams | f3acb83 | 2018-05-16 15:58:13 -0700 | [diff] [blame] | 1093 | for (i = 0; i < rs->nr; i++) { |
| 1094 | const struct refspec_item *item = &rs->items[i]; |
| 1095 | if (item->matching && |
| 1096 | (matching_refs == -1 || item->force)) { |
Paolo Bonzini | a83619d | 2008-04-28 11:32:12 -0400 | [diff] [blame] | 1097 | matching_refs = i; |
| 1098 | continue; |
| 1099 | } |
| 1100 | |
Brandon Williams | f3acb83 | 2018-05-16 15:58:13 -0700 | [diff] [blame] | 1101 | if (item->pattern) { |
| 1102 | const char *dst_side = item->dst ? item->dst : item->src; |
Felipe Contreras | 6ddba5e | 2012-02-23 00:43:41 +0200 | [diff] [blame] | 1103 | int match; |
| 1104 | if (direction == FROM_SRC) |
Brandon Williams | f3acb83 | 2018-05-16 15:58:13 -0700 | [diff] [blame] | 1105 | match = match_name_with_pattern(item->src, ref->name, dst_side, &name); |
Felipe Contreras | 6ddba5e | 2012-02-23 00:43:41 +0200 | [diff] [blame] | 1106 | else |
Brandon Williams | f3acb83 | 2018-05-16 15:58:13 -0700 | [diff] [blame] | 1107 | match = match_name_with_pattern(dst_side, ref->name, item->src, &name); |
Felipe Contreras | 6ddba5e | 2012-02-23 00:43:41 +0200 | [diff] [blame] | 1108 | if (match) { |
Felipe Contreras | db70a04 | 2012-02-23 00:43:39 +0200 | [diff] [blame] | 1109 | matching_refs = i; |
| 1110 | break; |
| 1111 | } |
| 1112 | } |
Daniel Barkalow | 8558fd9 | 2007-05-25 01:20:56 -0400 | [diff] [blame] | 1113 | } |
Felipe Contreras | db70a04 | 2012-02-23 00:43:39 +0200 | [diff] [blame] | 1114 | if (matching_refs == -1) |
Paolo Bonzini | a83619d | 2008-04-28 11:32:12 -0400 | [diff] [blame] | 1115 | return NULL; |
Felipe Contreras | db70a04 | 2012-02-23 00:43:39 +0200 | [diff] [blame] | 1116 | |
Brandon Williams | f3acb83 | 2018-05-16 15:58:13 -0700 | [diff] [blame] | 1117 | pat = &rs->items[matching_refs]; |
Felipe Contreras | db70a04 | 2012-02-23 00:43:39 +0200 | [diff] [blame] | 1118 | if (pat->matching) { |
| 1119 | /* |
| 1120 | * "matching refs"; traditionally we pushed everything |
| 1121 | * including refs outside refs/heads/ hierarchy, but |
| 1122 | * that does not make much sense these days. |
| 1123 | */ |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 1124 | if (!send_mirror && !starts_with(ref->name, "refs/heads/")) |
Felipe Contreras | db70a04 | 2012-02-23 00:43:39 +0200 | [diff] [blame] | 1125 | return NULL; |
| 1126 | name = xstrdup(ref->name); |
| 1127 | } |
| 1128 | if (ret_pat) |
| 1129 | *ret_pat = pat; |
| 1130 | return name; |
Daniel Barkalow | 8558fd9 | 2007-05-25 01:20:56 -0400 | [diff] [blame] | 1131 | } |
| 1132 | |
Clemens Buchacher | 6d2bf96 | 2009-05-31 16:26:48 +0200 | [diff] [blame] | 1133 | static struct ref **tail_ref(struct ref **head) |
| 1134 | { |
| 1135 | struct ref **tail = head; |
| 1136 | while (*tail) |
| 1137 | tail = &((*tail)->next); |
| 1138 | return tail; |
| 1139 | } |
| 1140 | |
Junio C Hamano | c2aba15 | 2013-03-04 12:09:50 -0800 | [diff] [blame] | 1141 | struct tips { |
| 1142 | struct commit **tip; |
| 1143 | int nr, alloc; |
| 1144 | }; |
| 1145 | |
brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 +0000 | [diff] [blame] | 1146 | static void add_to_tips(struct tips *tips, const struct object_id *oid) |
Junio C Hamano | c2aba15 | 2013-03-04 12:09:50 -0800 | [diff] [blame] | 1147 | { |
| 1148 | struct commit *commit; |
| 1149 | |
brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 +0000 | [diff] [blame] | 1150 | if (is_null_oid(oid)) |
Junio C Hamano | c2aba15 | 2013-03-04 12:09:50 -0800 | [diff] [blame] | 1151 | return; |
Stefan Beller | 21e1ee8 | 2018-06-28 18:21:57 -0700 | [diff] [blame] | 1152 | commit = lookup_commit_reference_gently(the_repository, oid, 1); |
Junio C Hamano | c2aba15 | 2013-03-04 12:09:50 -0800 | [diff] [blame] | 1153 | if (!commit || (commit->object.flags & TMP_MARK)) |
| 1154 | return; |
| 1155 | commit->object.flags |= TMP_MARK; |
| 1156 | ALLOC_GROW(tips->tip, tips->nr + 1, tips->alloc); |
| 1157 | tips->tip[tips->nr++] = commit; |
| 1158 | } |
| 1159 | |
| 1160 | static void add_missing_tags(struct ref *src, struct ref **dst, struct ref ***dst_tail) |
| 1161 | { |
| 1162 | struct string_list dst_tag = STRING_LIST_INIT_NODUP; |
| 1163 | struct string_list src_tag = STRING_LIST_INIT_NODUP; |
| 1164 | struct string_list_item *item; |
| 1165 | struct ref *ref; |
| 1166 | struct tips sent_tips; |
| 1167 | |
| 1168 | /* |
| 1169 | * Collect everything we know they would have at the end of |
| 1170 | * this push, and collect all tags they have. |
| 1171 | */ |
| 1172 | memset(&sent_tips, 0, sizeof(sent_tips)); |
| 1173 | for (ref = *dst; ref; ref = ref->next) { |
| 1174 | if (ref->peer_ref && |
brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 +0000 | [diff] [blame] | 1175 | !is_null_oid(&ref->peer_ref->new_oid)) |
brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 +0000 | [diff] [blame] | 1176 | add_to_tips(&sent_tips, &ref->peer_ref->new_oid); |
Junio C Hamano | c2aba15 | 2013-03-04 12:09:50 -0800 | [diff] [blame] | 1177 | else |
brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 +0000 | [diff] [blame] | 1178 | add_to_tips(&sent_tips, &ref->old_oid); |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 1179 | if (starts_with(ref->name, "refs/tags/")) |
Junio C Hamano | c2aba15 | 2013-03-04 12:09:50 -0800 | [diff] [blame] | 1180 | string_list_append(&dst_tag, ref->name); |
| 1181 | } |
| 1182 | clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK); |
| 1183 | |
Michael Haggerty | 3383e19 | 2014-11-25 09:02:35 +0100 | [diff] [blame] | 1184 | string_list_sort(&dst_tag); |
Junio C Hamano | c2aba15 | 2013-03-04 12:09:50 -0800 | [diff] [blame] | 1185 | |
| 1186 | /* Collect tags they do not have. */ |
| 1187 | for (ref = src; ref; ref = ref->next) { |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 1188 | if (!starts_with(ref->name, "refs/tags/")) |
Junio C Hamano | c2aba15 | 2013-03-04 12:09:50 -0800 | [diff] [blame] | 1189 | continue; /* not a tag */ |
| 1190 | if (string_list_has_string(&dst_tag, ref->name)) |
| 1191 | continue; /* they already have it */ |
Stefan Beller | 0df8e96 | 2018-04-25 11:20:59 -0700 | [diff] [blame] | 1192 | if (oid_object_info(the_repository, &ref->new_oid, NULL) != OBJ_TAG) |
Junio C Hamano | c2aba15 | 2013-03-04 12:09:50 -0800 | [diff] [blame] | 1193 | continue; /* be conservative */ |
| 1194 | item = string_list_append(&src_tag, ref->name); |
| 1195 | item->util = ref; |
| 1196 | } |
| 1197 | string_list_clear(&dst_tag, 0); |
| 1198 | |
| 1199 | /* |
| 1200 | * At this point, src_tag lists tags that are missing from |
| 1201 | * dst, and sent_tips lists the tips we are pushing or those |
| 1202 | * that we know they already have. An element in the src_tag |
| 1203 | * that is an ancestor of any of the sent_tips needs to be |
| 1204 | * sent to the other side. |
| 1205 | */ |
| 1206 | if (sent_tips.nr) { |
| 1207 | for_each_string_list_item(item, &src_tag) { |
| 1208 | struct ref *ref = item->util; |
| 1209 | struct ref *dst_ref; |
| 1210 | struct commit *commit; |
| 1211 | |
brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 +0000 | [diff] [blame] | 1212 | if (is_null_oid(&ref->new_oid)) |
Junio C Hamano | c2aba15 | 2013-03-04 12:09:50 -0800 | [diff] [blame] | 1213 | continue; |
Stefan Beller | 21e1ee8 | 2018-06-28 18:21:57 -0700 | [diff] [blame] | 1214 | commit = lookup_commit_reference_gently(the_repository, |
| 1215 | &ref->new_oid, |
brian m. carlson | bc83266 | 2017-05-06 22:10:10 +0000 | [diff] [blame] | 1216 | 1); |
Junio C Hamano | c2aba15 | 2013-03-04 12:09:50 -0800 | [diff] [blame] | 1217 | if (!commit) |
| 1218 | /* not pushing a commit, which is not an error */ |
| 1219 | continue; |
| 1220 | |
| 1221 | /* |
| 1222 | * Is this tag, which they do not have, reachable from |
| 1223 | * any of the commits we are sending? |
| 1224 | */ |
| 1225 | if (!in_merge_bases_many(commit, sent_tips.nr, sent_tips.tip)) |
| 1226 | continue; |
| 1227 | |
| 1228 | /* Add it in */ |
| 1229 | dst_ref = make_linked_ref(ref->name, dst_tail); |
brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 +0000 | [diff] [blame] | 1230 | oidcpy(&dst_ref->new_oid, &ref->new_oid); |
Junio C Hamano | c2aba15 | 2013-03-04 12:09:50 -0800 | [diff] [blame] | 1231 | dst_ref->peer_ref = copy_ref(ref); |
| 1232 | } |
| 1233 | } |
| 1234 | string_list_clear(&src_tag, 0); |
| 1235 | free(sent_tips.tip); |
| 1236 | } |
| 1237 | |
Junio C Hamano | 47a5918 | 2013-07-08 13:56:53 -0700 | [diff] [blame] | 1238 | struct ref *find_ref_by_name(const struct ref *list, const char *name) |
| 1239 | { |
| 1240 | for ( ; list; list = list->next) |
| 1241 | if (!strcmp(list->name, name)) |
| 1242 | return (struct ref *)list; |
| 1243 | return NULL; |
| 1244 | } |
| 1245 | |
Brandon Casey | f1bd15a | 2013-07-08 01:58:39 -0700 | [diff] [blame] | 1246 | static void prepare_ref_index(struct string_list *ref_index, struct ref *ref) |
| 1247 | { |
| 1248 | for ( ; ref; ref = ref->next) |
| 1249 | string_list_append_nodup(ref_index, ref->name)->util = ref; |
| 1250 | |
Michael Haggerty | 3383e19 | 2014-11-25 09:02:35 +0100 | [diff] [blame] | 1251 | string_list_sort(ref_index); |
Brandon Casey | f1bd15a | 2013-07-08 01:58:39 -0700 | [diff] [blame] | 1252 | } |
| 1253 | |
Junio C Hamano | 54a8ad9 | 2007-06-08 23:22:58 -0700 | [diff] [blame] | 1254 | /* |
Jeff King | ba928c1 | 2014-03-05 14:04:54 -0500 | [diff] [blame] | 1255 | * Given only the set of local refs, sanity-check the set of push |
| 1256 | * refspecs. We can't catch all errors that match_push_refs would, |
| 1257 | * but we can catch some errors early before even talking to the |
| 1258 | * remote side. |
| 1259 | */ |
Brandon Williams | afb1aed | 2018-05-16 15:58:22 -0700 | [diff] [blame] | 1260 | int check_push_refs(struct ref *src, struct refspec *rs) |
Jeff King | ba928c1 | 2014-03-05 14:04:54 -0500 | [diff] [blame] | 1261 | { |
Jeff King | ba928c1 | 2014-03-05 14:04:54 -0500 | [diff] [blame] | 1262 | int ret = 0; |
| 1263 | int i; |
| 1264 | |
Brandon Williams | afb1aed | 2018-05-16 15:58:22 -0700 | [diff] [blame] | 1265 | for (i = 0; i < rs->nr; i++) { |
| 1266 | struct refspec_item *item = &rs->items[i]; |
Jeff King | ba928c1 | 2014-03-05 14:04:54 -0500 | [diff] [blame] | 1267 | |
Brandon Williams | afb1aed | 2018-05-16 15:58:22 -0700 | [diff] [blame] | 1268 | if (item->pattern || item->matching) |
Jeff King | ba928c1 | 2014-03-05 14:04:54 -0500 | [diff] [blame] | 1269 | continue; |
| 1270 | |
Brandon Williams | afb1aed | 2018-05-16 15:58:22 -0700 | [diff] [blame] | 1271 | ret |= match_explicit_lhs(src, item, NULL, NULL); |
Jeff King | ba928c1 | 2014-03-05 14:04:54 -0500 | [diff] [blame] | 1272 | } |
| 1273 | |
Jeff King | ba928c1 | 2014-03-05 14:04:54 -0500 | [diff] [blame] | 1274 | return ret; |
| 1275 | } |
| 1276 | |
| 1277 | /* |
Junio C Hamano | 29753cd | 2011-09-09 11:54:58 -0700 | [diff] [blame] | 1278 | * Given the set of refs the local repository has, the set of refs the |
| 1279 | * remote repository has, and the refspec used for push, determine |
| 1280 | * what remote refs we will update and with what value by setting |
| 1281 | * peer_ref (which object is being pushed) and force (if the push is |
| 1282 | * forced) in elements of "dst". The function may add new elements to |
| 1283 | * dst (e.g. pushing to a new branch, done in match_explicit_refs). |
Junio C Hamano | 54a8ad9 | 2007-06-08 23:22:58 -0700 | [diff] [blame] | 1284 | */ |
Junio C Hamano | 29753cd | 2011-09-09 11:54:58 -0700 | [diff] [blame] | 1285 | int match_push_refs(struct ref *src, struct ref **dst, |
Brandon Williams | 5c7ec84 | 2018-05-16 15:58:21 -0700 | [diff] [blame] | 1286 | struct refspec *rs, int flags) |
Daniel Barkalow | 6b62816 | 2007-05-12 11:45:59 -0400 | [diff] [blame] | 1287 | { |
Andy Whitcroft | 28b9d6e | 2007-11-09 23:32:10 +0000 | [diff] [blame] | 1288 | int send_all = flags & MATCH_REFS_ALL; |
| 1289 | int send_mirror = flags & MATCH_REFS_MIRROR; |
Felipe Contreras | 6ddba5e | 2012-02-23 00:43:41 +0200 | [diff] [blame] | 1290 | int send_prune = flags & MATCH_REFS_PRUNE; |
Jay Soffian | 5f48cb9 | 2009-02-25 03:32:17 -0500 | [diff] [blame] | 1291 | int errs; |
Felipe Contreras | b1d8b1f | 2012-02-23 00:43:38 +0200 | [diff] [blame] | 1292 | struct ref *ref, **dst_tail = tail_ref(dst); |
Brandon Casey | f1bd15a | 2013-07-08 01:58:39 -0700 | [diff] [blame] | 1293 | struct string_list dst_ref_index = STRING_LIST_INIT_NODUP; |
Daniel Barkalow | 6b62816 | 2007-05-12 11:45:59 -0400 | [diff] [blame] | 1294 | |
Brandon Williams | 5c7ec84 | 2018-05-16 15:58:21 -0700 | [diff] [blame] | 1295 | /* If no refspec is provided, use the default ":" */ |
| 1296 | if (!rs->nr) |
| 1297 | refspec_append(rs, ":"); |
| 1298 | |
| 1299 | errs = match_explicit_refs(src, *dst, &dst_tail, rs); |
Daniel Barkalow | 6b62816 | 2007-05-12 11:45:59 -0400 | [diff] [blame] | 1300 | |
| 1301 | /* pick the remainder */ |
Felipe Contreras | b1d8b1f | 2012-02-23 00:43:38 +0200 | [diff] [blame] | 1302 | for (ref = src; ref; ref = ref->next) { |
Brandon Casey | f1bd15a | 2013-07-08 01:58:39 -0700 | [diff] [blame] | 1303 | struct string_list_item *dst_item; |
Daniel Barkalow | 6b62816 | 2007-05-12 11:45:59 -0400 | [diff] [blame] | 1304 | struct ref *dst_peer; |
Brandon Williams | 0ad4a5f | 2018-05-16 15:57:49 -0700 | [diff] [blame] | 1305 | const struct refspec_item *pat = NULL; |
Alex Riesen | 6e66bf3 | 2007-06-08 01:43:05 +0200 | [diff] [blame] | 1306 | char *dst_name; |
Felipe Contreras | db70a04 | 2012-02-23 00:43:39 +0200 | [diff] [blame] | 1307 | |
Brandon Williams | 5c7ec84 | 2018-05-16 15:58:21 -0700 | [diff] [blame] | 1308 | dst_name = get_ref_match(rs, ref, send_mirror, FROM_SRC, &pat); |
Felipe Contreras | db70a04 | 2012-02-23 00:43:39 +0200 | [diff] [blame] | 1309 | if (!dst_name) |
Paolo Bonzini | a83619d | 2008-04-28 11:32:12 -0400 | [diff] [blame] | 1310 | continue; |
| 1311 | |
Brandon Casey | f1bd15a | 2013-07-08 01:58:39 -0700 | [diff] [blame] | 1312 | if (!dst_ref_index.nr) |
| 1313 | prepare_ref_index(&dst_ref_index, *dst); |
| 1314 | |
| 1315 | dst_item = string_list_lookup(&dst_ref_index, dst_name); |
| 1316 | dst_peer = dst_item ? dst_item->util : NULL; |
Paolo Bonzini | a83619d | 2008-04-28 11:32:12 -0400 | [diff] [blame] | 1317 | if (dst_peer) { |
| 1318 | if (dst_peer->peer_ref) |
| 1319 | /* We're already sending something to this ref. */ |
| 1320 | goto free_name; |
Paolo Bonzini | a83619d | 2008-04-28 11:32:12 -0400 | [diff] [blame] | 1321 | } else { |
| 1322 | if (pat->matching && !(send_all || send_mirror)) |
| 1323 | /* |
| 1324 | * Remote doesn't have it, and we have no |
| 1325 | * explicit pattern, and we don't have |
Justin Lebar | 0168990 | 2014-03-31 15:11:46 -0700 | [diff] [blame] | 1326 | * --all or --mirror. |
Paolo Bonzini | a83619d | 2008-04-28 11:32:12 -0400 | [diff] [blame] | 1327 | */ |
| 1328 | goto free_name; |
| 1329 | |
Daniel Barkalow | 6b62816 | 2007-05-12 11:45:59 -0400 | [diff] [blame] | 1330 | /* Create a new one and link it */ |
Clemens Buchacher | 6d2bf96 | 2009-05-31 16:26:48 +0200 | [diff] [blame] | 1331 | dst_peer = make_linked_ref(dst_name, &dst_tail); |
brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 +0000 | [diff] [blame] | 1332 | oidcpy(&dst_peer->new_oid, &ref->new_oid); |
Brandon Casey | f1bd15a | 2013-07-08 01:58:39 -0700 | [diff] [blame] | 1333 | string_list_insert(&dst_ref_index, |
| 1334 | dst_peer->name)->util = dst_peer; |
Daniel Barkalow | 6b62816 | 2007-05-12 11:45:59 -0400 | [diff] [blame] | 1335 | } |
Felipe Contreras | b1d8b1f | 2012-02-23 00:43:38 +0200 | [diff] [blame] | 1336 | dst_peer->peer_ref = copy_ref(ref); |
Paolo Bonzini | a83619d | 2008-04-28 11:32:12 -0400 | [diff] [blame] | 1337 | dst_peer->force = pat->force; |
Alex Riesen | 6e66bf3 | 2007-06-08 01:43:05 +0200 | [diff] [blame] | 1338 | free_name: |
| 1339 | free(dst_name); |
Daniel Barkalow | 6b62816 | 2007-05-12 11:45:59 -0400 | [diff] [blame] | 1340 | } |
Junio C Hamano | c2aba15 | 2013-03-04 12:09:50 -0800 | [diff] [blame] | 1341 | |
Brandon Casey | f1bd15a | 2013-07-08 01:58:39 -0700 | [diff] [blame] | 1342 | string_list_clear(&dst_ref_index, 0); |
| 1343 | |
Junio C Hamano | c2aba15 | 2013-03-04 12:09:50 -0800 | [diff] [blame] | 1344 | if (flags & MATCH_REFS_FOLLOW_TAGS) |
| 1345 | add_missing_tags(src, dst, &dst_tail); |
| 1346 | |
Felipe Contreras | 6ddba5e | 2012-02-23 00:43:41 +0200 | [diff] [blame] | 1347 | if (send_prune) { |
Brandon Casey | f1bd15a | 2013-07-08 01:58:39 -0700 | [diff] [blame] | 1348 | struct string_list src_ref_index = STRING_LIST_INIT_NODUP; |
Felipe Contreras | 6ddba5e | 2012-02-23 00:43:41 +0200 | [diff] [blame] | 1349 | /* check for missing refs on the remote */ |
| 1350 | for (ref = *dst; ref; ref = ref->next) { |
| 1351 | char *src_name; |
| 1352 | |
| 1353 | if (ref->peer_ref) |
| 1354 | /* We're already sending something to this ref. */ |
| 1355 | continue; |
| 1356 | |
Brandon Williams | 5c7ec84 | 2018-05-16 15:58:21 -0700 | [diff] [blame] | 1357 | src_name = get_ref_match(rs, ref, send_mirror, FROM_DST, NULL); |
Felipe Contreras | 6ddba5e | 2012-02-23 00:43:41 +0200 | [diff] [blame] | 1358 | if (src_name) { |
Brandon Casey | f1bd15a | 2013-07-08 01:58:39 -0700 | [diff] [blame] | 1359 | if (!src_ref_index.nr) |
| 1360 | prepare_ref_index(&src_ref_index, src); |
| 1361 | if (!string_list_has_string(&src_ref_index, |
| 1362 | src_name)) |
Felipe Contreras | 6ddba5e | 2012-02-23 00:43:41 +0200 | [diff] [blame] | 1363 | ref->peer_ref = alloc_delete_ref(); |
| 1364 | free(src_name); |
| 1365 | } |
| 1366 | } |
Brandon Casey | f1bd15a | 2013-07-08 01:58:39 -0700 | [diff] [blame] | 1367 | string_list_clear(&src_ref_index, 0); |
Felipe Contreras | 6ddba5e | 2012-02-23 00:43:41 +0200 | [diff] [blame] | 1368 | } |
Brandon Williams | 8ca6937 | 2018-05-16 15:57:57 -0700 | [diff] [blame] | 1369 | |
Jay Soffian | 5f48cb9 | 2009-02-25 03:32:17 -0500 | [diff] [blame] | 1370 | if (errs) |
| 1371 | return -1; |
Daniel Barkalow | 6b62816 | 2007-05-12 11:45:59 -0400 | [diff] [blame] | 1372 | return 0; |
| 1373 | } |
Daniel Barkalow | cf81834 | 2007-09-10 23:02:56 -0400 | [diff] [blame] | 1374 | |
Tay Ray Chuan | 20e8b46 | 2010-01-08 10:12:42 +0800 | [diff] [blame] | 1375 | void set_ref_status_for_push(struct ref *remote_refs, int send_mirror, |
Junio C Hamano | 631b5ef | 2013-07-08 14:42:40 -0700 | [diff] [blame] | 1376 | int force_update) |
Tay Ray Chuan | 20e8b46 | 2010-01-08 10:12:42 +0800 | [diff] [blame] | 1377 | { |
| 1378 | struct ref *ref; |
| 1379 | |
| 1380 | for (ref = remote_refs; ref; ref = ref->next) { |
Chris Rorvick | 8c5f6f7 | 2012-11-29 19:41:36 -0600 | [diff] [blame] | 1381 | int force_ref_update = ref->force || force_update; |
Junio C Hamano | 631b5ef | 2013-07-08 14:42:40 -0700 | [diff] [blame] | 1382 | int reject_reason = 0; |
Chris Rorvick | 8c5f6f7 | 2012-11-29 19:41:36 -0600 | [diff] [blame] | 1383 | |
Tay Ray Chuan | 20e8b46 | 2010-01-08 10:12:42 +0800 | [diff] [blame] | 1384 | if (ref->peer_ref) |
brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 +0000 | [diff] [blame] | 1385 | oidcpy(&ref->new_oid, &ref->peer_ref->new_oid); |
Tay Ray Chuan | 20e8b46 | 2010-01-08 10:12:42 +0800 | [diff] [blame] | 1386 | else if (!send_mirror) |
| 1387 | continue; |
| 1388 | |
brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 +0000 | [diff] [blame] | 1389 | ref->deletion = is_null_oid(&ref->new_oid); |
Tay Ray Chuan | 20e8b46 | 2010-01-08 10:12:42 +0800 | [diff] [blame] | 1390 | if (!ref->deletion && |
brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 +0000 | [diff] [blame] | 1391 | !oidcmp(&ref->old_oid, &ref->new_oid)) { |
Tay Ray Chuan | 20e8b46 | 2010-01-08 10:12:42 +0800 | [diff] [blame] | 1392 | ref->status = REF_STATUS_UPTODATE; |
| 1393 | continue; |
| 1394 | } |
| 1395 | |
Chris Rorvick | a272b28 | 2012-11-29 19:41:40 -0600 | [diff] [blame] | 1396 | /* |
Andrew Wheeler | b2e93f8 | 2016-01-29 17:18:42 -0600 | [diff] [blame] | 1397 | * If the remote ref has moved and is now different |
| 1398 | * from what we expect, reject any push. |
Junio C Hamano | 631b5ef | 2013-07-08 14:42:40 -0700 | [diff] [blame] | 1399 | * |
| 1400 | * It also is an error if the user told us to check |
| 1401 | * with the remote-tracking branch to find the value |
| 1402 | * to expect, but we did not have such a tracking |
| 1403 | * branch. |
| 1404 | */ |
| 1405 | if (ref->expect_old_sha1) { |
John Keeping | 64ac39a | 2016-07-26 21:44:45 +0100 | [diff] [blame] | 1406 | if (oidcmp(&ref->old_oid, &ref->old_oid_expect)) |
Junio C Hamano | 631b5ef | 2013-07-08 14:42:40 -0700 | [diff] [blame] | 1407 | reject_reason = REF_STATUS_REJECT_STALE; |
Andrew Wheeler | b2e93f8 | 2016-01-29 17:18:42 -0600 | [diff] [blame] | 1408 | else |
| 1409 | /* If the ref isn't stale then force the update. */ |
| 1410 | force_ref_update = 1; |
Junio C Hamano | 631b5ef | 2013-07-08 14:42:40 -0700 | [diff] [blame] | 1411 | } |
| 1412 | |
| 1413 | /* |
Andrew Wheeler | b2e93f8 | 2016-01-29 17:18:42 -0600 | [diff] [blame] | 1414 | * If the update isn't already rejected then check |
| 1415 | * the usual "must fast-forward" rules. |
Junio C Hamano | 631b5ef | 2013-07-08 14:42:40 -0700 | [diff] [blame] | 1416 | * |
Junio C Hamano | 256b9d7 | 2013-01-16 13:02:27 -0800 | [diff] [blame] | 1417 | * Decide whether an individual refspec A:B can be |
| 1418 | * pushed. The push will succeed if any of the |
| 1419 | * following are true: |
Tay Ray Chuan | 20e8b46 | 2010-01-08 10:12:42 +0800 | [diff] [blame] | 1420 | * |
Chris Rorvick | a272b28 | 2012-11-29 19:41:40 -0600 | [diff] [blame] | 1421 | * (1) the remote reference B does not exist |
Tay Ray Chuan | 20e8b46 | 2010-01-08 10:12:42 +0800 | [diff] [blame] | 1422 | * |
Chris Rorvick | a272b28 | 2012-11-29 19:41:40 -0600 | [diff] [blame] | 1423 | * (2) the remote reference B is being removed (i.e., |
| 1424 | * pushing :B where no source is specified) |
Tay Ray Chuan | 20e8b46 | 2010-01-08 10:12:42 +0800 | [diff] [blame] | 1425 | * |
Junio C Hamano | 256b9d7 | 2013-01-16 13:02:27 -0800 | [diff] [blame] | 1426 | * (3) the destination is not under refs/tags/, and |
| 1427 | * if the old and new value is a commit, the new |
| 1428 | * is a descendant of the old. |
Tay Ray Chuan | 20e8b46 | 2010-01-08 10:12:42 +0800 | [diff] [blame] | 1429 | * |
Chris Rorvick | a272b28 | 2012-11-29 19:41:40 -0600 | [diff] [blame] | 1430 | * (4) it is forced using the +A:B notation, or by |
| 1431 | * passing the --force argument |
Tay Ray Chuan | 20e8b46 | 2010-01-08 10:12:42 +0800 | [diff] [blame] | 1432 | */ |
| 1433 | |
Andrew Wheeler | b2e93f8 | 2016-01-29 17:18:42 -0600 | [diff] [blame] | 1434 | if (!reject_reason && !ref->deletion && !is_null_oid(&ref->old_oid)) { |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 1435 | if (starts_with(ref->name, "refs/tags/")) |
Junio C Hamano | 631b5ef | 2013-07-08 14:42:40 -0700 | [diff] [blame] | 1436 | reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS; |
brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 +0000 | [diff] [blame] | 1437 | else if (!has_object_file(&ref->old_oid)) |
Junio C Hamano | 631b5ef | 2013-07-08 14:42:40 -0700 | [diff] [blame] | 1438 | reject_reason = REF_STATUS_REJECT_FETCH_FIRST; |
Stefan Beller | 21e1ee8 | 2018-06-28 18:21:57 -0700 | [diff] [blame] | 1439 | else if (!lookup_commit_reference_gently(the_repository, &ref->old_oid, 1) || |
| 1440 | !lookup_commit_reference_gently(the_repository, &ref->new_oid, 1)) |
Junio C Hamano | 631b5ef | 2013-07-08 14:42:40 -0700 | [diff] [blame] | 1441 | reject_reason = REF_STATUS_REJECT_NEEDS_FORCE; |
brian m. carlson | 6f3d57b | 2015-11-10 02:22:25 +0000 | [diff] [blame] | 1442 | else if (!ref_newer(&ref->new_oid, &ref->old_oid)) |
Junio C Hamano | 631b5ef | 2013-07-08 14:42:40 -0700 | [diff] [blame] | 1443 | reject_reason = REF_STATUS_REJECT_NONFASTFORWARD; |
Tay Ray Chuan | 20e8b46 | 2010-01-08 10:12:42 +0800 | [diff] [blame] | 1444 | } |
Junio C Hamano | 631b5ef | 2013-07-08 14:42:40 -0700 | [diff] [blame] | 1445 | |
| 1446 | /* |
| 1447 | * "--force" will defeat any rejection implemented |
| 1448 | * by the rules above. |
| 1449 | */ |
| 1450 | if (!force_ref_update) |
| 1451 | ref->status = reject_reason; |
| 1452 | else if (reject_reason) |
| 1453 | ref->forced_update = 1; |
Tay Ray Chuan | 20e8b46 | 2010-01-08 10:12:42 +0800 | [diff] [blame] | 1454 | } |
| 1455 | } |
| 1456 | |
Junio C Hamano | 05e7368 | 2014-10-14 14:42:04 -0700 | [diff] [blame] | 1457 | static void set_merge(struct branch *ret) |
| 1458 | { |
Jeff King | 9e3751d | 2015-05-21 00:45:13 -0400 | [diff] [blame] | 1459 | struct remote *remote; |
Junio C Hamano | 05e7368 | 2014-10-14 14:42:04 -0700 | [diff] [blame] | 1460 | char *ref; |
brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 +0000 | [diff] [blame] | 1461 | struct object_id oid; |
Junio C Hamano | 05e7368 | 2014-10-14 14:42:04 -0700 | [diff] [blame] | 1462 | int i; |
| 1463 | |
Jeff King | ee2499f | 2015-05-21 00:45:09 -0400 | [diff] [blame] | 1464 | if (!ret) |
| 1465 | return; /* no branch */ |
| 1466 | if (ret->merge) |
| 1467 | return; /* already run */ |
| 1468 | if (!ret->remote_name || !ret->merge_nr) { |
| 1469 | /* |
| 1470 | * no merge config; let's make sure we don't confuse callers |
| 1471 | * with a non-zero merge_nr but a NULL merge |
| 1472 | */ |
| 1473 | ret->merge_nr = 0; |
| 1474 | return; |
| 1475 | } |
| 1476 | |
Jeff King | 9e3751d | 2015-05-21 00:45:13 -0400 | [diff] [blame] | 1477 | remote = remote_get(ret->remote_name); |
| 1478 | |
Junio C Hamano | 05e7368 | 2014-10-14 14:42:04 -0700 | [diff] [blame] | 1479 | ret->merge = xcalloc(ret->merge_nr, sizeof(*ret->merge)); |
| 1480 | for (i = 0; i < ret->merge_nr; i++) { |
| 1481 | ret->merge[i] = xcalloc(1, sizeof(**ret->merge)); |
| 1482 | ret->merge[i]->src = xstrdup(ret->merge_name[i]); |
Jeff King | 9e3751d | 2015-05-21 00:45:13 -0400 | [diff] [blame] | 1483 | if (!remote_find_tracking(remote, ret->merge[i]) || |
Junio C Hamano | 05e7368 | 2014-10-14 14:42:04 -0700 | [diff] [blame] | 1484 | strcmp(ret->remote_name, ".")) |
| 1485 | continue; |
| 1486 | if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]), |
brian m. carlson | cca5fa6 | 2017-10-15 22:06:57 +0000 | [diff] [blame] | 1487 | &oid, &ref) == 1) |
Junio C Hamano | 05e7368 | 2014-10-14 14:42:04 -0700 | [diff] [blame] | 1488 | ret->merge[i]->dst = ref; |
| 1489 | else |
| 1490 | ret->merge[i]->dst = xstrdup(ret->merge_name[i]); |
| 1491 | } |
| 1492 | } |
| 1493 | |
Daniel Barkalow | cf81834 | 2007-09-10 23:02:56 -0400 | [diff] [blame] | 1494 | struct branch *branch_get(const char *name) |
| 1495 | { |
| 1496 | struct branch *ret; |
| 1497 | |
| 1498 | read_config(); |
| 1499 | if (!name || !*name || !strcmp(name, "HEAD")) |
| 1500 | ret = current_branch; |
| 1501 | else |
| 1502 | ret = make_branch(name, 0); |
Jeff King | ee2499f | 2015-05-21 00:45:09 -0400 | [diff] [blame] | 1503 | set_merge(ret); |
Daniel Barkalow | cf81834 | 2007-09-10 23:02:56 -0400 | [diff] [blame] | 1504 | return ret; |
| 1505 | } |
| 1506 | |
| 1507 | int branch_has_merge_config(struct branch *branch) |
| 1508 | { |
| 1509 | return branch && !!branch->merge; |
| 1510 | } |
| 1511 | |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 1512 | int branch_merge_matches(struct branch *branch, |
| 1513 | int i, |
| 1514 | const char *refname) |
Daniel Barkalow | cf81834 | 2007-09-10 23:02:56 -0400 | [diff] [blame] | 1515 | { |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 1516 | if (!branch || i < 0 || i >= branch->merge_nr) |
Daniel Barkalow | cf81834 | 2007-09-10 23:02:56 -0400 | [diff] [blame] | 1517 | return 0; |
Michael Haggerty | 54457fe | 2014-01-14 04:16:07 +0100 | [diff] [blame] | 1518 | return refname_match(branch->merge[i]->src, refname); |
Daniel Barkalow | cf81834 | 2007-09-10 23:02:56 -0400 | [diff] [blame] | 1519 | } |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 1520 | |
Jeff King | 060e776 | 2016-04-25 17:15:23 -0400 | [diff] [blame] | 1521 | __attribute__((format (printf,2,3))) |
Jeff King | 3a429d0 | 2015-05-21 00:45:32 -0400 | [diff] [blame] | 1522 | static const char *error_buf(struct strbuf *err, const char *fmt, ...) |
Jeff King | a9f9f8c | 2015-05-21 00:45:28 -0400 | [diff] [blame] | 1523 | { |
Jeff King | 3a429d0 | 2015-05-21 00:45:32 -0400 | [diff] [blame] | 1524 | if (err) { |
| 1525 | va_list ap; |
| 1526 | va_start(ap, fmt); |
| 1527 | strbuf_vaddf(err, fmt, ap); |
| 1528 | va_end(ap); |
| 1529 | } |
| 1530 | return NULL; |
| 1531 | } |
| 1532 | |
| 1533 | const char *branch_get_upstream(struct branch *branch, struct strbuf *err) |
| 1534 | { |
| 1535 | if (!branch) |
| 1536 | return error_buf(err, _("HEAD does not point to a branch")); |
Jeff King | 1ca41a1 | 2015-05-21 20:46:43 -0400 | [diff] [blame] | 1537 | |
| 1538 | if (!branch->merge || !branch->merge[0]) { |
| 1539 | /* |
| 1540 | * no merge config; is it because the user didn't define any, |
| 1541 | * or because it is not a real branch, and get_branch |
| 1542 | * auto-vivified it? |
| 1543 | */ |
Jeff King | 3a429d0 | 2015-05-21 00:45:32 -0400 | [diff] [blame] | 1544 | if (!ref_exists(branch->refname)) |
| 1545 | return error_buf(err, _("no such branch: '%s'"), |
| 1546 | branch->name); |
Jeff King | 1ca41a1 | 2015-05-21 20:46:43 -0400 | [diff] [blame] | 1547 | return error_buf(err, |
| 1548 | _("no upstream configured for branch '%s'"), |
| 1549 | branch->name); |
| 1550 | } |
| 1551 | |
| 1552 | if (!branch->merge[0]->dst) |
Jeff King | 3a429d0 | 2015-05-21 00:45:32 -0400 | [diff] [blame] | 1553 | return error_buf(err, |
| 1554 | _("upstream branch '%s' not stored as a remote-tracking branch"), |
| 1555 | branch->merge[0]->src); |
Jeff King | 3a429d0 | 2015-05-21 00:45:32 -0400 | [diff] [blame] | 1556 | |
Jeff King | a9f9f8c | 2015-05-21 00:45:28 -0400 | [diff] [blame] | 1557 | return branch->merge[0]->dst; |
| 1558 | } |
| 1559 | |
Jeff King | e291c75 | 2015-05-21 00:45:36 -0400 | [diff] [blame] | 1560 | static const char *tracking_for_push_dest(struct remote *remote, |
| 1561 | const char *refname, |
| 1562 | struct strbuf *err) |
| 1563 | { |
| 1564 | char *ret; |
| 1565 | |
Brandon Williams | d000414 | 2018-05-16 15:58:11 -0700 | [diff] [blame] | 1566 | ret = apply_refspecs(&remote->fetch, refname); |
Jeff King | e291c75 | 2015-05-21 00:45:36 -0400 | [diff] [blame] | 1567 | if (!ret) |
| 1568 | return error_buf(err, |
| 1569 | _("push destination '%s' on remote '%s' has no local tracking branch"), |
| 1570 | refname, remote->name); |
| 1571 | return ret; |
| 1572 | } |
| 1573 | |
| 1574 | static const char *branch_get_push_1(struct branch *branch, struct strbuf *err) |
| 1575 | { |
| 1576 | struct remote *remote; |
| 1577 | |
Jeff King | e291c75 | 2015-05-21 00:45:36 -0400 | [diff] [blame] | 1578 | remote = remote_get(pushremote_for_branch(branch, NULL)); |
| 1579 | if (!remote) |
| 1580 | return error_buf(err, |
| 1581 | _("branch '%s' has no remote for pushing"), |
| 1582 | branch->name); |
| 1583 | |
Brandon Williams | 6bdb304 | 2018-05-16 15:58:00 -0700 | [diff] [blame] | 1584 | if (remote->push.nr) { |
Jeff King | e291c75 | 2015-05-21 00:45:36 -0400 | [diff] [blame] | 1585 | char *dst; |
| 1586 | const char *ret; |
| 1587 | |
Brandon Williams | d000414 | 2018-05-16 15:58:11 -0700 | [diff] [blame] | 1588 | dst = apply_refspecs(&remote->push, branch->refname); |
Jeff King | e291c75 | 2015-05-21 00:45:36 -0400 | [diff] [blame] | 1589 | if (!dst) |
| 1590 | return error_buf(err, |
| 1591 | _("push refspecs for '%s' do not include '%s'"), |
| 1592 | remote->name, branch->name); |
| 1593 | |
| 1594 | ret = tracking_for_push_dest(remote, dst, err); |
| 1595 | free(dst); |
| 1596 | return ret; |
| 1597 | } |
| 1598 | |
| 1599 | if (remote->mirror) |
| 1600 | return tracking_for_push_dest(remote, branch->refname, err); |
| 1601 | |
| 1602 | switch (push_default) { |
| 1603 | case PUSH_DEFAULT_NOTHING: |
| 1604 | return error_buf(err, _("push has no destination (push.default is 'nothing')")); |
| 1605 | |
| 1606 | case PUSH_DEFAULT_MATCHING: |
| 1607 | case PUSH_DEFAULT_CURRENT: |
| 1608 | return tracking_for_push_dest(remote, branch->refname, err); |
| 1609 | |
| 1610 | case PUSH_DEFAULT_UPSTREAM: |
| 1611 | return branch_get_upstream(branch, err); |
| 1612 | |
| 1613 | case PUSH_DEFAULT_UNSPECIFIED: |
| 1614 | case PUSH_DEFAULT_SIMPLE: |
| 1615 | { |
| 1616 | const char *up, *cur; |
| 1617 | |
| 1618 | up = branch_get_upstream(branch, err); |
| 1619 | if (!up) |
| 1620 | return NULL; |
| 1621 | cur = tracking_for_push_dest(remote, branch->refname, err); |
| 1622 | if (!cur) |
| 1623 | return NULL; |
| 1624 | if (strcmp(cur, up)) |
| 1625 | return error_buf(err, |
| 1626 | _("cannot resolve 'simple' push to a single destination")); |
| 1627 | return cur; |
| 1628 | } |
| 1629 | } |
| 1630 | |
Johannes Schindelin | 033abf9 | 2018-05-02 11:38:39 +0200 | [diff] [blame] | 1631 | BUG("unhandled push situation"); |
Jeff King | e291c75 | 2015-05-21 00:45:36 -0400 | [diff] [blame] | 1632 | } |
| 1633 | |
| 1634 | const char *branch_get_push(struct branch *branch, struct strbuf *err) |
| 1635 | { |
Kyle Meyer | b10731f | 2017-01-06 20:12:15 -0500 | [diff] [blame] | 1636 | if (!branch) |
| 1637 | return error_buf(err, _("HEAD does not point to a branch")); |
| 1638 | |
Jeff King | e291c75 | 2015-05-21 00:45:36 -0400 | [diff] [blame] | 1639 | if (!branch->push_tracking_ref) |
| 1640 | branch->push_tracking_ref = branch_get_push_1(branch, err); |
| 1641 | return branch->push_tracking_ref; |
| 1642 | } |
| 1643 | |
Junio C Hamano | f8fb971 | 2012-12-11 13:00:52 -0800 | [diff] [blame] | 1644 | static int ignore_symref_update(const char *refname) |
| 1645 | { |
Junio C Hamano | f8fb971 | 2012-12-11 13:00:52 -0800 | [diff] [blame] | 1646 | int flag; |
| 1647 | |
René Scharfe | 744c040 | 2017-09-23 11:45:04 +0200 | [diff] [blame] | 1648 | if (!resolve_ref_unsafe(refname, 0, NULL, &flag)) |
Junio C Hamano | f8fb971 | 2012-12-11 13:00:52 -0800 | [diff] [blame] | 1649 | return 0; /* non-existing refs are OK */ |
| 1650 | return (flag & REF_ISSYMREF); |
| 1651 | } |
| 1652 | |
Michael Haggerty | f166db2 | 2013-10-30 06:32:56 +0100 | [diff] [blame] | 1653 | /* |
| 1654 | * Create and return a list of (struct ref) consisting of copies of |
| 1655 | * each remote_ref that matches refspec. refspec must be a pattern. |
| 1656 | * Fill in the copies' peer_ref to describe the local tracking refs to |
| 1657 | * which they map. Omit any references that would map to an existing |
| 1658 | * local symbolic ref. |
| 1659 | */ |
Daniel Barkalow | 4577370 | 2007-10-29 21:05:40 -0400 | [diff] [blame] | 1660 | static struct ref *get_expanded_map(const struct ref *remote_refs, |
Brandon Williams | 0ad4a5f | 2018-05-16 15:57:49 -0700 | [diff] [blame] | 1661 | const struct refspec_item *refspec) |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 1662 | { |
Daniel Barkalow | 4577370 | 2007-10-29 21:05:40 -0400 | [diff] [blame] | 1663 | const struct ref *ref; |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 1664 | struct ref *ret = NULL; |
| 1665 | struct ref **tail = &ret; |
| 1666 | |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 1667 | for (ref = remote_refs; ref; ref = ref->next) { |
Michael Haggerty | e31a17f | 2013-10-30 06:32:57 +0100 | [diff] [blame] | 1668 | char *expn_name = NULL; |
| 1669 | |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 1670 | if (strchr(ref->name, '^')) |
| 1671 | continue; /* a dereference item */ |
Daniel Barkalow | e928213 | 2009-03-07 01:11:34 -0500 | [diff] [blame] | 1672 | if (match_name_with_pattern(refspec->src, ref->name, |
Junio C Hamano | f8fb971 | 2012-12-11 13:00:52 -0800 | [diff] [blame] | 1673 | refspec->dst, &expn_name) && |
| 1674 | !ignore_symref_update(expn_name)) { |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 1675 | struct ref *cpy = copy_ref(ref); |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 1676 | |
Daniel Barkalow | e928213 | 2009-03-07 01:11:34 -0500 | [diff] [blame] | 1677 | cpy->peer_ref = alloc_ref(expn_name); |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 1678 | if (refspec->force) |
| 1679 | cpy->peer_ref->force = 1; |
| 1680 | *tail = cpy; |
| 1681 | tail = &cpy->next; |
| 1682 | } |
Michael Haggerty | e31a17f | 2013-10-30 06:32:57 +0100 | [diff] [blame] | 1683 | free(expn_name); |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 1684 | } |
| 1685 | |
| 1686 | return ret; |
| 1687 | } |
| 1688 | |
Daniel Barkalow | 4577370 | 2007-10-29 21:05:40 -0400 | [diff] [blame] | 1689 | static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name) |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 1690 | { |
Daniel Barkalow | 4577370 | 2007-10-29 21:05:40 -0400 | [diff] [blame] | 1691 | const struct ref *ref; |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 1692 | for (ref = refs; ref; ref = ref->next) { |
Michael Haggerty | 54457fe | 2014-01-14 04:16:07 +0100 | [diff] [blame] | 1693 | if (refname_match(name, ref->name)) |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 1694 | return ref; |
| 1695 | } |
| 1696 | return NULL; |
| 1697 | } |
| 1698 | |
Daniel Barkalow | 4577370 | 2007-10-29 21:05:40 -0400 | [diff] [blame] | 1699 | struct ref *get_remote_ref(const struct ref *remote_refs, const char *name) |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 1700 | { |
Daniel Barkalow | 4577370 | 2007-10-29 21:05:40 -0400 | [diff] [blame] | 1701 | const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name); |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 1702 | |
| 1703 | if (!ref) |
Junio C Hamano | 9ad7c5a | 2007-10-26 23:09:48 -0700 | [diff] [blame] | 1704 | return NULL; |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 1705 | |
| 1706 | return copy_ref(ref); |
| 1707 | } |
| 1708 | |
| 1709 | static struct ref *get_local_ref(const char *name) |
| 1710 | { |
Clemens Buchacher | 3eb9699 | 2009-06-17 15:38:36 +0200 | [diff] [blame] | 1711 | if (!name || name[0] == '\0') |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 1712 | return NULL; |
| 1713 | |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 1714 | if (starts_with(name, "refs/")) |
René Scharfe | 59c69c0 | 2008-10-18 10:44:18 +0200 | [diff] [blame] | 1715 | return alloc_ref(name); |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 1716 | |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 1717 | if (starts_with(name, "heads/") || |
| 1718 | starts_with(name, "tags/") || |
| 1719 | starts_with(name, "remotes/")) |
René Scharfe | 8009768 | 2008-10-18 10:37:40 +0200 | [diff] [blame] | 1720 | return alloc_ref_with_prefix("refs/", 5, name); |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 1721 | |
René Scharfe | 8009768 | 2008-10-18 10:37:40 +0200 | [diff] [blame] | 1722 | return alloc_ref_with_prefix("refs/heads/", 11, name); |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 1723 | } |
| 1724 | |
Daniel Barkalow | 4577370 | 2007-10-29 21:05:40 -0400 | [diff] [blame] | 1725 | int get_fetch_map(const struct ref *remote_refs, |
Brandon Williams | 0ad4a5f | 2018-05-16 15:57:49 -0700 | [diff] [blame] | 1726 | const struct refspec_item *refspec, |
Junio C Hamano | 9ad7c5a | 2007-10-26 23:09:48 -0700 | [diff] [blame] | 1727 | struct ref ***tail, |
| 1728 | int missing_ok) |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 1729 | { |
Daniel Barkalow | ef00d15 | 2008-03-17 22:05:23 -0400 | [diff] [blame] | 1730 | struct ref *ref_map, **rmp; |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 1731 | |
| 1732 | if (refspec->pattern) { |
| 1733 | ref_map = get_expanded_map(remote_refs, refspec); |
| 1734 | } else { |
Junio C Hamano | 9ad7c5a | 2007-10-26 23:09:48 -0700 | [diff] [blame] | 1735 | const char *name = refspec->src[0] ? refspec->src : "HEAD"; |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 1736 | |
Junio C Hamano | 6e7b66e | 2013-01-29 14:02:15 -0800 | [diff] [blame] | 1737 | if (refspec->exact_sha1) { |
| 1738 | ref_map = alloc_ref(name); |
brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 +0000 | [diff] [blame] | 1739 | get_oid_hex(name, &ref_map->old_oid); |
Brandon Williams | 7330205 | 2018-06-27 15:30:23 -0700 | [diff] [blame] | 1740 | ref_map->exact_oid = 1; |
Junio C Hamano | 6e7b66e | 2013-01-29 14:02:15 -0800 | [diff] [blame] | 1741 | } else { |
| 1742 | ref_map = get_remote_ref(remote_refs, name); |
| 1743 | } |
Junio C Hamano | 9ad7c5a | 2007-10-26 23:09:48 -0700 | [diff] [blame] | 1744 | if (!missing_ok && !ref_map) |
| 1745 | die("Couldn't find remote ref %s", name); |
| 1746 | if (ref_map) { |
| 1747 | ref_map->peer_ref = get_local_ref(refspec->dst); |
| 1748 | if (ref_map->peer_ref && refspec->force) |
| 1749 | ref_map->peer_ref->force = 1; |
| 1750 | } |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 1751 | } |
| 1752 | |
Daniel Barkalow | ef00d15 | 2008-03-17 22:05:23 -0400 | [diff] [blame] | 1753 | for (rmp = &ref_map; *rmp; ) { |
| 1754 | if ((*rmp)->peer_ref) { |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 1755 | if (!starts_with((*rmp)->peer_ref->name, "refs/") || |
Junio C Hamano | 5c08c1f | 2012-05-04 15:35:18 -0700 | [diff] [blame] | 1756 | check_refname_format((*rmp)->peer_ref->name, 0)) { |
Daniel Barkalow | ef00d15 | 2008-03-17 22:05:23 -0400 | [diff] [blame] | 1757 | struct ref *ignore = *rmp; |
| 1758 | error("* Ignoring funny ref '%s' locally", |
| 1759 | (*rmp)->peer_ref->name); |
| 1760 | *rmp = (*rmp)->next; |
| 1761 | free(ignore->peer_ref); |
| 1762 | free(ignore); |
| 1763 | continue; |
| 1764 | } |
| 1765 | } |
| 1766 | rmp = &((*rmp)->next); |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 1767 | } |
| 1768 | |
Alex Riesen | 8f70a76 | 2007-10-12 22:40:04 +0200 | [diff] [blame] | 1769 | if (ref_map) |
| 1770 | tail_link_ref(ref_map, tail); |
Daniel Barkalow | d71ab17 | 2007-09-10 23:03:08 -0400 | [diff] [blame] | 1771 | |
| 1772 | return 0; |
| 1773 | } |
Daniel Barkalow | be885d9 | 2008-04-26 15:53:12 -0400 | [diff] [blame] | 1774 | |
| 1775 | int resolve_remote_symref(struct ref *ref, struct ref *list) |
| 1776 | { |
| 1777 | if (!ref->symref) |
| 1778 | return 0; |
| 1779 | for (; list; list = list->next) |
| 1780 | if (!strcmp(ref->symref, list->name)) { |
brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 +0000 | [diff] [blame] | 1781 | oidcpy(&ref->old_oid, &list->old_oid); |
Daniel Barkalow | be885d9 | 2008-04-26 15:53:12 -0400 | [diff] [blame] | 1782 | return 0; |
| 1783 | } |
| 1784 | return 1; |
| 1785 | } |
Junio C Hamano | 6d21bf9 | 2008-07-02 00:51:18 -0700 | [diff] [blame] | 1786 | |
Jay Soffian | ec8452d | 2009-02-25 03:32:12 -0500 | [diff] [blame] | 1787 | static void unmark_and_free(struct commit_list *list, unsigned int mark) |
| 1788 | { |
| 1789 | while (list) { |
René Scharfe | e510ab8 | 2015-10-24 18:21:31 +0200 | [diff] [blame] | 1790 | struct commit *commit = pop_commit(&list); |
| 1791 | commit->object.flags &= ~mark; |
Jay Soffian | ec8452d | 2009-02-25 03:32:12 -0500 | [diff] [blame] | 1792 | } |
| 1793 | } |
| 1794 | |
brian m. carlson | 6f3d57b | 2015-11-10 02:22:25 +0000 | [diff] [blame] | 1795 | int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid) |
Jay Soffian | ec8452d | 2009-02-25 03:32:12 -0500 | [diff] [blame] | 1796 | { |
| 1797 | struct object *o; |
Brandon Williams | f3bbe63 | 2018-02-14 10:59:47 -0800 | [diff] [blame] | 1798 | struct commit *old_commit, *new_commit; |
Jay Soffian | ec8452d | 2009-02-25 03:32:12 -0500 | [diff] [blame] | 1799 | struct commit_list *list, *used; |
| 1800 | int found = 0; |
| 1801 | |
Junio C Hamano | 75e5c0d | 2013-01-23 13:55:30 -0800 | [diff] [blame] | 1802 | /* |
Brandon Williams | f3bbe63 | 2018-02-14 10:59:47 -0800 | [diff] [blame] | 1803 | * Both new_commit and old_commit must be commit-ish and new_commit is descendant of |
| 1804 | * old_commit. Otherwise we require --force. |
Jay Soffian | ec8452d | 2009-02-25 03:32:12 -0500 | [diff] [blame] | 1805 | */ |
Stefan Beller | a74093d | 2018-06-28 18:22:05 -0700 | [diff] [blame] | 1806 | o = deref_tag(the_repository, parse_object(the_repository, old_oid), |
| 1807 | NULL, 0); |
Jay Soffian | ec8452d | 2009-02-25 03:32:12 -0500 | [diff] [blame] | 1808 | if (!o || o->type != OBJ_COMMIT) |
| 1809 | return 0; |
Brandon Williams | f3bbe63 | 2018-02-14 10:59:47 -0800 | [diff] [blame] | 1810 | old_commit = (struct commit *) o; |
Jay Soffian | ec8452d | 2009-02-25 03:32:12 -0500 | [diff] [blame] | 1811 | |
Stefan Beller | a74093d | 2018-06-28 18:22:05 -0700 | [diff] [blame] | 1812 | o = deref_tag(the_repository, parse_object(the_repository, new_oid), |
| 1813 | NULL, 0); |
Jay Soffian | ec8452d | 2009-02-25 03:32:12 -0500 | [diff] [blame] | 1814 | if (!o || o->type != OBJ_COMMIT) |
| 1815 | return 0; |
Brandon Williams | f3bbe63 | 2018-02-14 10:59:47 -0800 | [diff] [blame] | 1816 | new_commit = (struct commit *) o; |
Jay Soffian | ec8452d | 2009-02-25 03:32:12 -0500 | [diff] [blame] | 1817 | |
Brandon Williams | f3bbe63 | 2018-02-14 10:59:47 -0800 | [diff] [blame] | 1818 | if (parse_commit(new_commit) < 0) |
Jay Soffian | ec8452d | 2009-02-25 03:32:12 -0500 | [diff] [blame] | 1819 | return 0; |
| 1820 | |
| 1821 | used = list = NULL; |
Brandon Williams | f3bbe63 | 2018-02-14 10:59:47 -0800 | [diff] [blame] | 1822 | commit_list_insert(new_commit, &list); |
Jay Soffian | ec8452d | 2009-02-25 03:32:12 -0500 | [diff] [blame] | 1823 | while (list) { |
Brandon Williams | f3bbe63 | 2018-02-14 10:59:47 -0800 | [diff] [blame] | 1824 | new_commit = pop_most_recent_commit(&list, TMP_MARK); |
| 1825 | commit_list_insert(new_commit, &used); |
| 1826 | if (new_commit == old_commit) { |
Jay Soffian | ec8452d | 2009-02-25 03:32:12 -0500 | [diff] [blame] | 1827 | found = 1; |
| 1828 | break; |
| 1829 | } |
| 1830 | } |
| 1831 | unmark_and_free(list, TMP_MARK); |
| 1832 | unmark_and_free(used, TMP_MARK); |
| 1833 | return found; |
| 1834 | } |
| 1835 | |
Junio C Hamano | 6d21bf9 | 2008-07-02 00:51:18 -0700 | [diff] [blame] | 1836 | /* |
Jeff Hostetler | d7d1b49 | 2018-01-09 18:50:15 +0000 | [diff] [blame] | 1837 | * Lookup the upstream branch for the given branch and if present, optionally |
| 1838 | * compute the commit ahead/behind values for the pair. |
| 1839 | * |
| 1840 | * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the |
| 1841 | * counts in *num_ours and *num_theirs. If abf is AHEAD_BEHIND_QUICK, skip |
| 1842 | * the (potentially expensive) a/b computation (*num_ours and *num_theirs are |
| 1843 | * set to zero). |
| 1844 | * |
| 1845 | * The name of the upstream branch (or NULL if no upstream is defined) is |
| 1846 | * returned via *upstream_name, if it is not itself NULL. |
Jiang Xin | f2e0873 | 2013-08-26 15:02:48 +0800 | [diff] [blame] | 1847 | * |
Jeff King | 979cb24 | 2015-05-21 20:49:11 -0400 | [diff] [blame] | 1848 | * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no |
Jeff Hostetler | d7d1b49 | 2018-01-09 18:50:15 +0000 | [diff] [blame] | 1849 | * upstream defined, or ref does not exist). Returns 0 if the commits are |
| 1850 | * identical. Returns 1 if commits are different. |
Junio C Hamano | 6d21bf9 | 2008-07-02 00:51:18 -0700 | [diff] [blame] | 1851 | */ |
Jeff King | 979cb24 | 2015-05-21 20:49:11 -0400 | [diff] [blame] | 1852 | int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs, |
Jeff Hostetler | d7d1b49 | 2018-01-09 18:50:15 +0000 | [diff] [blame] | 1853 | const char **upstream_name, enum ahead_behind_flags abf) |
Junio C Hamano | 6d21bf9 | 2008-07-02 00:51:18 -0700 | [diff] [blame] | 1854 | { |
brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 +0000 | [diff] [blame] | 1855 | struct object_id oid; |
Junio C Hamano | 6d21bf9 | 2008-07-02 00:51:18 -0700 | [diff] [blame] | 1856 | struct commit *ours, *theirs; |
Junio C Hamano | 6d21bf9 | 2008-07-02 00:51:18 -0700 | [diff] [blame] | 1857 | struct rev_info revs; |
Jeff King | 0b282cc | 2015-09-24 17:07:58 -0400 | [diff] [blame] | 1858 | const char *base; |
| 1859 | struct argv_array argv = ARGV_ARRAY_INIT; |
Junio C Hamano | 6d21bf9 | 2008-07-02 00:51:18 -0700 | [diff] [blame] | 1860 | |
Jiang Xin | f2e0873 | 2013-08-26 15:02:48 +0800 | [diff] [blame] | 1861 | /* Cannot stat unless we are marked to build on top of somebody else. */ |
Jeff King | 3a429d0 | 2015-05-21 00:45:32 -0400 | [diff] [blame] | 1862 | base = branch_get_upstream(branch, NULL); |
Jeff King | 979cb24 | 2015-05-21 20:49:11 -0400 | [diff] [blame] | 1863 | if (upstream_name) |
| 1864 | *upstream_name = base; |
Jeff King | a9f9f8c | 2015-05-21 00:45:28 -0400 | [diff] [blame] | 1865 | if (!base) |
Jeff King | 979cb24 | 2015-05-21 20:49:11 -0400 | [diff] [blame] | 1866 | return -1; |
Junio C Hamano | 6d21bf9 | 2008-07-02 00:51:18 -0700 | [diff] [blame] | 1867 | |
Jiang Xin | f2e0873 | 2013-08-26 15:02:48 +0800 | [diff] [blame] | 1868 | /* Cannot stat if what we used to build on no longer exists */ |
brian m. carlson | 34c290a | 2017-10-15 22:06:56 +0000 | [diff] [blame] | 1869 | if (read_ref(base, &oid)) |
Jiang Xin | f2e0873 | 2013-08-26 15:02:48 +0800 | [diff] [blame] | 1870 | return -1; |
Stefan Beller | 2122f67 | 2018-06-28 18:21:58 -0700 | [diff] [blame] | 1871 | theirs = lookup_commit_reference(the_repository, &oid); |
Junio C Hamano | 6d21bf9 | 2008-07-02 00:51:18 -0700 | [diff] [blame] | 1872 | if (!theirs) |
Jiang Xin | f2e0873 | 2013-08-26 15:02:48 +0800 | [diff] [blame] | 1873 | return -1; |
Junio C Hamano | 6d21bf9 | 2008-07-02 00:51:18 -0700 | [diff] [blame] | 1874 | |
brian m. carlson | 34c290a | 2017-10-15 22:06:56 +0000 | [diff] [blame] | 1875 | if (read_ref(branch->refname, &oid)) |
Jiang Xin | f2e0873 | 2013-08-26 15:02:48 +0800 | [diff] [blame] | 1876 | return -1; |
Stefan Beller | 2122f67 | 2018-06-28 18:21:58 -0700 | [diff] [blame] | 1877 | ours = lookup_commit_reference(the_repository, &oid); |
Junio C Hamano | 6d21bf9 | 2008-07-02 00:51:18 -0700 | [diff] [blame] | 1878 | if (!ours) |
Jiang Xin | f2e0873 | 2013-08-26 15:02:48 +0800 | [diff] [blame] | 1879 | return -1; |
Junio C Hamano | 6d21bf9 | 2008-07-02 00:51:18 -0700 | [diff] [blame] | 1880 | |
Jeff Hostetler | d7d1b49 | 2018-01-09 18:50:15 +0000 | [diff] [blame] | 1881 | *num_theirs = *num_ours = 0; |
| 1882 | |
Junio C Hamano | 6d21bf9 | 2008-07-02 00:51:18 -0700 | [diff] [blame] | 1883 | /* are we the same? */ |
Jeff Hostetler | d7d1b49 | 2018-01-09 18:50:15 +0000 | [diff] [blame] | 1884 | if (theirs == ours) |
Jeff King | 979cb24 | 2015-05-21 20:49:11 -0400 | [diff] [blame] | 1885 | return 0; |
Jeff Hostetler | d7d1b49 | 2018-01-09 18:50:15 +0000 | [diff] [blame] | 1886 | if (abf == AHEAD_BEHIND_QUICK) |
| 1887 | return 1; |
Jeff Hostetler | fd9b544 | 2018-01-09 18:50:16 +0000 | [diff] [blame] | 1888 | if (abf != AHEAD_BEHIND_FULL) |
| 1889 | BUG("stat_tracking_info: invalid abf '%d'", abf); |
Junio C Hamano | 6d21bf9 | 2008-07-02 00:51:18 -0700 | [diff] [blame] | 1890 | |
Junio C Hamano | 8fbf879 | 2009-04-21 16:32:18 -0700 | [diff] [blame] | 1891 | /* Run "rev-list --left-right ours...theirs" internally... */ |
Jeff King | 0b282cc | 2015-09-24 17:07:58 -0400 | [diff] [blame] | 1892 | argv_array_push(&argv, ""); /* ignored */ |
| 1893 | argv_array_push(&argv, "--left-right"); |
| 1894 | argv_array_pushf(&argv, "%s...%s", |
brian m. carlson | f2fd076 | 2015-11-10 02:22:28 +0000 | [diff] [blame] | 1895 | oid_to_hex(&ours->object.oid), |
| 1896 | oid_to_hex(&theirs->object.oid)); |
Jeff King | 0b282cc | 2015-09-24 17:07:58 -0400 | [diff] [blame] | 1897 | argv_array_push(&argv, "--"); |
Junio C Hamano | 6d21bf9 | 2008-07-02 00:51:18 -0700 | [diff] [blame] | 1898 | |
| 1899 | init_revisions(&revs, NULL); |
Jeff King | 0b282cc | 2015-09-24 17:07:58 -0400 | [diff] [blame] | 1900 | setup_revisions(argv.argc, argv.argv, &revs, NULL); |
Stefan Beller | 81c3ce3 | 2014-08-10 23:33:26 +0200 | [diff] [blame] | 1901 | if (prepare_revision_walk(&revs)) |
| 1902 | die("revision walk setup failed"); |
Junio C Hamano | 6d21bf9 | 2008-07-02 00:51:18 -0700 | [diff] [blame] | 1903 | |
| 1904 | /* ... and count the commits on each side. */ |
Junio C Hamano | 6d21bf9 | 2008-07-02 00:51:18 -0700 | [diff] [blame] | 1905 | while (1) { |
| 1906 | struct commit *c = get_revision(&revs); |
| 1907 | if (!c) |
| 1908 | break; |
| 1909 | if (c->object.flags & SYMMETRIC_LEFT) |
| 1910 | (*num_ours)++; |
| 1911 | else |
| 1912 | (*num_theirs)++; |
| 1913 | } |
Junio C Hamano | c0234b2 | 2008-07-03 12:09:48 -0700 | [diff] [blame] | 1914 | |
| 1915 | /* clear object flags smudged by the above traversal */ |
| 1916 | clear_commit_marks(ours, ALL_REV_FLAGS); |
| 1917 | clear_commit_marks(theirs, ALL_REV_FLAGS); |
Jeff King | 0b282cc | 2015-09-24 17:07:58 -0400 | [diff] [blame] | 1918 | |
| 1919 | argv_array_clear(&argv); |
Jeff Hostetler | d7d1b49 | 2018-01-09 18:50:15 +0000 | [diff] [blame] | 1920 | return 1; |
Junio C Hamano | 6d21bf9 | 2008-07-02 00:51:18 -0700 | [diff] [blame] | 1921 | } |
| 1922 | |
| 1923 | /* |
| 1924 | * Return true when there is anything to report, otherwise false. |
| 1925 | */ |
Jeff Hostetler | f39a757 | 2018-01-09 18:50:18 +0000 | [diff] [blame] | 1926 | int format_tracking_info(struct branch *branch, struct strbuf *sb, |
| 1927 | enum ahead_behind_flags abf) |
Junio C Hamano | 6d21bf9 | 2008-07-02 00:51:18 -0700 | [diff] [blame] | 1928 | { |
Jeff Hostetler | f39a757 | 2018-01-09 18:50:18 +0000 | [diff] [blame] | 1929 | int ours, theirs, sti; |
Jeff King | 979cb24 | 2015-05-21 20:49:11 -0400 | [diff] [blame] | 1930 | const char *full_base; |
Stefan Beller | 2f50bab | 2014-08-10 21:43:33 +0200 | [diff] [blame] | 1931 | char *base; |
Jiang Xin | f2e0873 | 2013-08-26 15:02:48 +0800 | [diff] [blame] | 1932 | int upstream_is_gone = 0; |
Junio C Hamano | 6d21bf9 | 2008-07-02 00:51:18 -0700 | [diff] [blame] | 1933 | |
Jeff Hostetler | f39a757 | 2018-01-09 18:50:18 +0000 | [diff] [blame] | 1934 | sti = stat_tracking_info(branch, &ours, &theirs, &full_base, abf); |
| 1935 | if (sti < 0) { |
Jeff King | 979cb24 | 2015-05-21 20:49:11 -0400 | [diff] [blame] | 1936 | if (!full_base) |
| 1937 | return 0; |
Jiang Xin | f2e0873 | 2013-08-26 15:02:48 +0800 | [diff] [blame] | 1938 | upstream_is_gone = 1; |
Jiang Xin | f2e0873 | 2013-08-26 15:02:48 +0800 | [diff] [blame] | 1939 | } |
Junio C Hamano | 6d21bf9 | 2008-07-02 00:51:18 -0700 | [diff] [blame] | 1940 | |
Jeff King | 979cb24 | 2015-05-21 20:49:11 -0400 | [diff] [blame] | 1941 | base = shorten_unambiguous_ref(full_base, 0); |
Jiang Xin | f2e0873 | 2013-08-26 15:02:48 +0800 | [diff] [blame] | 1942 | if (upstream_is_gone) { |
| 1943 | strbuf_addf(sb, |
| 1944 | _("Your branch is based on '%s', but the upstream is gone.\n"), |
| 1945 | base); |
| 1946 | if (advice_status_hints) |
René Scharfe | a22ae75 | 2016-09-15 20:31:00 +0200 | [diff] [blame] | 1947 | strbuf_addstr(sb, |
Jiang Xin | f2e0873 | 2013-08-26 15:02:48 +0800 | [diff] [blame] | 1948 | _(" (use \"git branch --unset-upstream\" to fixup)\n")); |
Jeff Hostetler | f39a757 | 2018-01-09 18:50:18 +0000 | [diff] [blame] | 1949 | } else if (!sti) { |
Jiang Xin | f223459 | 2013-08-26 15:02:49 +0800 | [diff] [blame] | 1950 | strbuf_addf(sb, |
Martin Ågren | 7560f54 | 2017-08-23 19:49:35 +0200 | [diff] [blame] | 1951 | _("Your branch is up to date with '%s'.\n"), |
Jiang Xin | f223459 | 2013-08-26 15:02:49 +0800 | [diff] [blame] | 1952 | base); |
Jeff Hostetler | f39a757 | 2018-01-09 18:50:18 +0000 | [diff] [blame] | 1953 | } else if (abf == AHEAD_BEHIND_QUICK) { |
| 1954 | strbuf_addf(sb, |
| 1955 | _("Your branch and '%s' refer to different commits.\n"), |
| 1956 | base); |
| 1957 | if (advice_status_hints) |
| 1958 | strbuf_addf(sb, _(" (use \"%s\" for details)\n"), |
| 1959 | "git status --ahead-behind"); |
Jiang Xin | f2e0873 | 2013-08-26 15:02:48 +0800 | [diff] [blame] | 1960 | } else if (!theirs) { |
Jiang Xin | 8a5b749 | 2012-02-02 10:02:23 +0800 | [diff] [blame] | 1961 | strbuf_addf(sb, |
| 1962 | Q_("Your branch is ahead of '%s' by %d commit.\n", |
| 1963 | "Your branch is ahead of '%s' by %d commits.\n", |
Jiang Xin | f2e0873 | 2013-08-26 15:02:48 +0800 | [diff] [blame] | 1964 | ours), |
| 1965 | base, ours); |
Jeff King | 491e307 | 2012-12-03 01:16:57 -0500 | [diff] [blame] | 1966 | if (advice_status_hints) |
René Scharfe | a22ae75 | 2016-09-15 20:31:00 +0200 | [diff] [blame] | 1967 | strbuf_addstr(sb, |
Jeff King | 491e307 | 2012-12-03 01:16:57 -0500 | [diff] [blame] | 1968 | _(" (use \"git push\" to publish your local commits)\n")); |
Jiang Xin | f2e0873 | 2013-08-26 15:02:48 +0800 | [diff] [blame] | 1969 | } else if (!ours) { |
Jiang Xin | 8a5b749 | 2012-02-02 10:02:23 +0800 | [diff] [blame] | 1970 | strbuf_addf(sb, |
| 1971 | Q_("Your branch is behind '%s' by %d commit, " |
| 1972 | "and can be fast-forwarded.\n", |
| 1973 | "Your branch is behind '%s' by %d commits, " |
| 1974 | "and can be fast-forwarded.\n", |
Jiang Xin | f2e0873 | 2013-08-26 15:02:48 +0800 | [diff] [blame] | 1975 | theirs), |
| 1976 | base, theirs); |
Jeff King | 491e307 | 2012-12-03 01:16:57 -0500 | [diff] [blame] | 1977 | if (advice_status_hints) |
René Scharfe | a22ae75 | 2016-09-15 20:31:00 +0200 | [diff] [blame] | 1978 | strbuf_addstr(sb, |
Jeff King | 491e307 | 2012-12-03 01:16:57 -0500 | [diff] [blame] | 1979 | _(" (use \"git pull\" to update your local branch)\n")); |
Matthieu Moy | c190ced | 2012-11-15 11:45:00 +0100 | [diff] [blame] | 1980 | } else { |
Jiang Xin | 8a5b749 | 2012-02-02 10:02:23 +0800 | [diff] [blame] | 1981 | strbuf_addf(sb, |
| 1982 | Q_("Your branch and '%s' have diverged,\n" |
| 1983 | "and have %d and %d different commit each, " |
| 1984 | "respectively.\n", |
| 1985 | "Your branch and '%s' have diverged,\n" |
| 1986 | "and have %d and %d different commits each, " |
| 1987 | "respectively.\n", |
Nguyễn Thái Ngọc Duy | f54bea4 | 2016-05-03 07:12:30 +0700 | [diff] [blame] | 1988 | ours + theirs), |
Jiang Xin | f2e0873 | 2013-08-26 15:02:48 +0800 | [diff] [blame] | 1989 | base, ours, theirs); |
Jeff King | 491e307 | 2012-12-03 01:16:57 -0500 | [diff] [blame] | 1990 | if (advice_status_hints) |
René Scharfe | a22ae75 | 2016-09-15 20:31:00 +0200 | [diff] [blame] | 1991 | strbuf_addstr(sb, |
Jeff King | 491e307 | 2012-12-03 01:16:57 -0500 | [diff] [blame] | 1992 | _(" (use \"git pull\" to merge the remote branch into yours)\n")); |
Matthieu Moy | c190ced | 2012-11-15 11:45:00 +0100 | [diff] [blame] | 1993 | } |
Stefan Beller | 2f50bab | 2014-08-10 21:43:33 +0200 | [diff] [blame] | 1994 | free(base); |
Junio C Hamano | 6d21bf9 | 2008-07-02 00:51:18 -0700 | [diff] [blame] | 1995 | return 1; |
| 1996 | } |
Jay Soffian | 454e202 | 2009-02-25 03:32:11 -0500 | [diff] [blame] | 1997 | |
Michael Haggerty | 455ade6 | 2015-05-25 18:39:01 +0000 | [diff] [blame] | 1998 | static int one_local_ref(const char *refname, const struct object_id *oid, |
| 1999 | int flag, void *cb_data) |
Jay Soffian | 454e202 | 2009-02-25 03:32:11 -0500 | [diff] [blame] | 2000 | { |
| 2001 | struct ref ***local_tail = cb_data; |
| 2002 | struct ref *ref; |
Jay Soffian | 454e202 | 2009-02-25 03:32:11 -0500 | [diff] [blame] | 2003 | |
| 2004 | /* we already know it starts with refs/ to get here */ |
Michael Haggerty | 8d9c501 | 2011-09-15 23:10:25 +0200 | [diff] [blame] | 2005 | if (check_refname_format(refname + 5, 0)) |
Jay Soffian | 454e202 | 2009-02-25 03:32:11 -0500 | [diff] [blame] | 2006 | return 0; |
| 2007 | |
Jeff King | 96ffc06 | 2016-02-22 17:44:32 -0500 | [diff] [blame] | 2008 | ref = alloc_ref(refname); |
brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 +0000 | [diff] [blame] | 2009 | oidcpy(&ref->new_oid, oid); |
Jay Soffian | 454e202 | 2009-02-25 03:32:11 -0500 | [diff] [blame] | 2010 | **local_tail = ref; |
| 2011 | *local_tail = &ref->next; |
| 2012 | return 0; |
| 2013 | } |
| 2014 | |
| 2015 | struct ref *get_local_heads(void) |
| 2016 | { |
Nguyễn Thái Ngọc Duy | 55f0566 | 2009-04-17 08:16:23 +1000 | [diff] [blame] | 2017 | struct ref *local_refs = NULL, **local_tail = &local_refs; |
Michael Haggerty | 2b2a5be | 2015-05-25 18:38:28 +0000 | [diff] [blame] | 2018 | |
Jay Soffian | 454e202 | 2009-02-25 03:32:11 -0500 | [diff] [blame] | 2019 | for_each_ref(one_local_ref, &local_tail); |
| 2020 | return local_refs; |
| 2021 | } |
Jay Soffian | 8ef5173 | 2009-02-25 03:32:13 -0500 | [diff] [blame] | 2022 | |
Jay Soffian | 4229f1f | 2009-02-27 14:10:05 -0500 | [diff] [blame] | 2023 | struct ref *guess_remote_head(const struct ref *head, |
| 2024 | const struct ref *refs, |
| 2025 | int all) |
Jay Soffian | 8ef5173 | 2009-02-25 03:32:13 -0500 | [diff] [blame] | 2026 | { |
Jay Soffian | 8ef5173 | 2009-02-25 03:32:13 -0500 | [diff] [blame] | 2027 | const struct ref *r; |
Jay Soffian | 4229f1f | 2009-02-27 14:10:05 -0500 | [diff] [blame] | 2028 | struct ref *list = NULL; |
| 2029 | struct ref **tail = &list; |
Jay Soffian | 8ef5173 | 2009-02-25 03:32:13 -0500 | [diff] [blame] | 2030 | |
Jay Soffian | 6cb4e6c | 2009-02-25 03:32:14 -0500 | [diff] [blame] | 2031 | if (!head) |
Jay Soffian | 8ef5173 | 2009-02-25 03:32:13 -0500 | [diff] [blame] | 2032 | return NULL; |
| 2033 | |
Jeff King | fbb074c | 2009-02-27 14:10:06 -0500 | [diff] [blame] | 2034 | /* |
| 2035 | * Some transports support directly peeking at |
| 2036 | * where HEAD points; if that is the case, then |
| 2037 | * we don't have to guess. |
| 2038 | */ |
| 2039 | if (head->symref) |
| 2040 | return copy_ref(find_ref_by_name(refs, head->symref)); |
| 2041 | |
Jay Soffian | 8ef5173 | 2009-02-25 03:32:13 -0500 | [diff] [blame] | 2042 | /* If refs/heads/master could be right, it is. */ |
Jay Soffian | 4229f1f | 2009-02-27 14:10:05 -0500 | [diff] [blame] | 2043 | if (!all) { |
| 2044 | r = find_ref_by_name(refs, "refs/heads/master"); |
brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 +0000 | [diff] [blame] | 2045 | if (r && !oidcmp(&r->old_oid, &head->old_oid)) |
Jay Soffian | 4229f1f | 2009-02-27 14:10:05 -0500 | [diff] [blame] | 2046 | return copy_ref(r); |
| 2047 | } |
Jay Soffian | 8ef5173 | 2009-02-25 03:32:13 -0500 | [diff] [blame] | 2048 | |
| 2049 | /* Look for another ref that points there */ |
Jay Soffian | 4229f1f | 2009-02-27 14:10:05 -0500 | [diff] [blame] | 2050 | for (r = refs; r; r = r->next) { |
Jeff King | 61adfd3 | 2011-06-03 01:11:13 -0400 | [diff] [blame] | 2051 | if (r != head && |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 2052 | starts_with(r->name, "refs/heads/") && |
brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 +0000 | [diff] [blame] | 2053 | !oidcmp(&r->old_oid, &head->old_oid)) { |
Jay Soffian | 4229f1f | 2009-02-27 14:10:05 -0500 | [diff] [blame] | 2054 | *tail = copy_ref(r); |
| 2055 | tail = &((*tail)->next); |
| 2056 | if (!all) |
| 2057 | break; |
| 2058 | } |
| 2059 | } |
Jay Soffian | 8ef5173 | 2009-02-25 03:32:13 -0500 | [diff] [blame] | 2060 | |
Jay Soffian | 4229f1f | 2009-02-27 14:10:05 -0500 | [diff] [blame] | 2061 | return list; |
Jay Soffian | 8ef5173 | 2009-02-25 03:32:13 -0500 | [diff] [blame] | 2062 | } |
Jay Soffian | f2ef607 | 2009-11-10 00:03:31 -0500 | [diff] [blame] | 2063 | |
| 2064 | struct stale_heads_info { |
Jay Soffian | f2ef607 | 2009-11-10 00:03:31 -0500 | [diff] [blame] | 2065 | struct string_list *ref_names; |
| 2066 | struct ref **stale_refs_tail; |
Brandon Williams | a2ac50c | 2018-05-16 15:58:10 -0700 | [diff] [blame] | 2067 | struct refspec *rs; |
Jay Soffian | f2ef607 | 2009-11-10 00:03:31 -0500 | [diff] [blame] | 2068 | }; |
| 2069 | |
Michael Haggerty | 455ade6 | 2015-05-25 18:39:01 +0000 | [diff] [blame] | 2070 | static int get_stale_heads_cb(const char *refname, const struct object_id *oid, |
| 2071 | int flags, void *cb_data) |
Jay Soffian | f2ef607 | 2009-11-10 00:03:31 -0500 | [diff] [blame] | 2072 | { |
| 2073 | struct stale_heads_info *info = cb_data; |
Carlos Martín Nieto | e6f6371 | 2014-02-27 10:00:10 +0100 | [diff] [blame] | 2074 | struct string_list matches = STRING_LIST_INIT_DUP; |
Brandon Williams | 0ad4a5f | 2018-05-16 15:57:49 -0700 | [diff] [blame] | 2075 | struct refspec_item query; |
Carlos Martín Nieto | e6f6371 | 2014-02-27 10:00:10 +0100 | [diff] [blame] | 2076 | int i, stale = 1; |
Brandon Williams | 0ad4a5f | 2018-05-16 15:57:49 -0700 | [diff] [blame] | 2077 | memset(&query, 0, sizeof(struct refspec_item)); |
Carlos Martín Nieto | ed43de6 | 2011-10-15 07:04:25 +0200 | [diff] [blame] | 2078 | query.dst = (char *)refname; |
| 2079 | |
Brandon Williams | a2ac50c | 2018-05-16 15:58:10 -0700 | [diff] [blame] | 2080 | query_refspecs_multiple(info->rs, &query, &matches); |
Carlos Martín Nieto | e6f6371 | 2014-02-27 10:00:10 +0100 | [diff] [blame] | 2081 | if (matches.nr == 0) |
| 2082 | goto clean_exit; /* No matches */ |
Carlos Martín Nieto | ed43de6 | 2011-10-15 07:04:25 +0200 | [diff] [blame] | 2083 | |
| 2084 | /* |
| 2085 | * If we did find a suitable refspec and it's not a symref and |
| 2086 | * it's not in the list of refs that currently exist in that |
Carlos Martín Nieto | e6f6371 | 2014-02-27 10:00:10 +0100 | [diff] [blame] | 2087 | * remote, we consider it to be stale. In order to deal with |
| 2088 | * overlapping refspecs, we need to go over all of the |
| 2089 | * matching refs. |
Carlos Martín Nieto | ed43de6 | 2011-10-15 07:04:25 +0200 | [diff] [blame] | 2090 | */ |
Carlos Martín Nieto | e6f6371 | 2014-02-27 10:00:10 +0100 | [diff] [blame] | 2091 | if (flags & REF_ISSYMREF) |
| 2092 | goto clean_exit; |
| 2093 | |
| 2094 | for (i = 0; stale && i < matches.nr; i++) |
| 2095 | if (string_list_has_string(info->ref_names, matches.items[i].string)) |
| 2096 | stale = 0; |
| 2097 | |
| 2098 | if (stale) { |
Carlos Martín Nieto | ed43de6 | 2011-10-15 07:04:25 +0200 | [diff] [blame] | 2099 | struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail); |
brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 +0000 | [diff] [blame] | 2100 | oidcpy(&ref->new_oid, oid); |
Jay Soffian | f2ef607 | 2009-11-10 00:03:31 -0500 | [diff] [blame] | 2101 | } |
Carlos Martín Nieto | ed43de6 | 2011-10-15 07:04:25 +0200 | [diff] [blame] | 2102 | |
Carlos Martín Nieto | e6f6371 | 2014-02-27 10:00:10 +0100 | [diff] [blame] | 2103 | clean_exit: |
| 2104 | string_list_clear(&matches, 0); |
Jay Soffian | f2ef607 | 2009-11-10 00:03:31 -0500 | [diff] [blame] | 2105 | return 0; |
| 2106 | } |
| 2107 | |
Brandon Williams | a2ac50c | 2018-05-16 15:58:10 -0700 | [diff] [blame] | 2108 | struct ref *get_stale_heads(struct refspec *rs, struct ref *fetch_map) |
Jay Soffian | f2ef607 | 2009-11-10 00:03:31 -0500 | [diff] [blame] | 2109 | { |
| 2110 | struct ref *ref, *stale_refs = NULL; |
Thiago Farina | 183113a | 2010-07-04 16:46:19 -0300 | [diff] [blame] | 2111 | struct string_list ref_names = STRING_LIST_INIT_NODUP; |
Jay Soffian | f2ef607 | 2009-11-10 00:03:31 -0500 | [diff] [blame] | 2112 | struct stale_heads_info info; |
Michael Haggerty | 2b2a5be | 2015-05-25 18:38:28 +0000 | [diff] [blame] | 2113 | |
Jay Soffian | f2ef607 | 2009-11-10 00:03:31 -0500 | [diff] [blame] | 2114 | info.ref_names = &ref_names; |
| 2115 | info.stale_refs_tail = &stale_refs; |
Brandon Williams | a2ac50c | 2018-05-16 15:58:10 -0700 | [diff] [blame] | 2116 | info.rs = rs; |
Jay Soffian | f2ef607 | 2009-11-10 00:03:31 -0500 | [diff] [blame] | 2117 | for (ref = fetch_map; ref; ref = ref->next) |
Julian Phillips | 1d2f80f | 2010-06-26 00:41:38 +0100 | [diff] [blame] | 2118 | string_list_append(&ref_names, ref->name); |
Michael Haggerty | 3383e19 | 2014-11-25 09:02:35 +0100 | [diff] [blame] | 2119 | string_list_sort(&ref_names); |
Jay Soffian | f2ef607 | 2009-11-10 00:03:31 -0500 | [diff] [blame] | 2120 | for_each_ref(get_stale_heads_cb, &info); |
| 2121 | string_list_clear(&ref_names, 0); |
| 2122 | return stale_refs; |
| 2123 | } |
Junio C Hamano | 28f5d17 | 2013-07-08 15:34:36 -0700 | [diff] [blame] | 2124 | |
| 2125 | /* |
| 2126 | * Compare-and-swap |
| 2127 | */ |
Junio C Hamano | a355b11 | 2015-01-14 14:58:44 -0800 | [diff] [blame] | 2128 | static void clear_cas_option(struct push_cas_option *cas) |
Junio C Hamano | 28f5d17 | 2013-07-08 15:34:36 -0700 | [diff] [blame] | 2129 | { |
| 2130 | int i; |
| 2131 | |
| 2132 | for (i = 0; i < cas->nr; i++) |
| 2133 | free(cas->entry[i].refname); |
| 2134 | free(cas->entry); |
| 2135 | memset(cas, 0, sizeof(*cas)); |
| 2136 | } |
| 2137 | |
| 2138 | static struct push_cas *add_cas_entry(struct push_cas_option *cas, |
| 2139 | const char *refname, |
| 2140 | size_t refnamelen) |
| 2141 | { |
| 2142 | struct push_cas *entry; |
| 2143 | ALLOC_GROW(cas->entry, cas->nr + 1, cas->alloc); |
| 2144 | entry = &cas->entry[cas->nr++]; |
| 2145 | memset(entry, 0, sizeof(*entry)); |
| 2146 | entry->refname = xmemdupz(refname, refnamelen); |
| 2147 | return entry; |
| 2148 | } |
| 2149 | |
Junio C Hamano | 8668976 | 2017-03-31 13:20:48 -0700 | [diff] [blame] | 2150 | static int parse_push_cas_option(struct push_cas_option *cas, const char *arg, int unset) |
Junio C Hamano | 28f5d17 | 2013-07-08 15:34:36 -0700 | [diff] [blame] | 2151 | { |
| 2152 | const char *colon; |
| 2153 | struct push_cas *entry; |
| 2154 | |
| 2155 | if (unset) { |
| 2156 | /* "--no-<option>" */ |
| 2157 | clear_cas_option(cas); |
| 2158 | return 0; |
| 2159 | } |
| 2160 | |
| 2161 | if (!arg) { |
| 2162 | /* just "--<option>" */ |
| 2163 | cas->use_tracking_for_rest = 1; |
| 2164 | return 0; |
| 2165 | } |
| 2166 | |
| 2167 | /* "--<option>=refname" or "--<option>=refname:value" */ |
| 2168 | colon = strchrnul(arg, ':'); |
| 2169 | entry = add_cas_entry(cas, arg, colon - arg); |
| 2170 | if (!*colon) |
| 2171 | entry->use_tracking = 1; |
John Keeping | eee98e7 | 2016-07-26 21:44:44 +0100 | [diff] [blame] | 2172 | else if (!colon[1]) |
brian m. carlson | b8566f8 | 2017-07-13 23:49:21 +0000 | [diff] [blame] | 2173 | oidclr(&entry->expect); |
| 2174 | else if (get_oid(colon + 1, &entry->expect)) |
Junio C Hamano | 28f5d17 | 2013-07-08 15:34:36 -0700 | [diff] [blame] | 2175 | return error("cannot parse expected object name '%s'", colon + 1); |
| 2176 | return 0; |
| 2177 | } |
| 2178 | |
| 2179 | int parseopt_push_cas_option(const struct option *opt, const char *arg, int unset) |
| 2180 | { |
| 2181 | return parse_push_cas_option(opt->value, arg, unset); |
| 2182 | } |
Junio C Hamano | 91048a9 | 2013-07-09 11:01:06 -0700 | [diff] [blame] | 2183 | |
| 2184 | int is_empty_cas(const struct push_cas_option *cas) |
| 2185 | { |
| 2186 | return !cas->use_tracking_for_rest && !cas->nr; |
| 2187 | } |
| 2188 | |
| 2189 | /* |
| 2190 | * Look at remote.fetch refspec and see if we have a remote |
| 2191 | * tracking branch for the refname there. Fill its current |
| 2192 | * value in sha1[]. |
| 2193 | * If we cannot do so, return negative to signal an error. |
| 2194 | */ |
| 2195 | static int remote_tracking(struct remote *remote, const char *refname, |
brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 +0000 | [diff] [blame] | 2196 | struct object_id *oid) |
Junio C Hamano | 91048a9 | 2013-07-09 11:01:06 -0700 | [diff] [blame] | 2197 | { |
| 2198 | char *dst; |
| 2199 | |
Brandon Williams | d000414 | 2018-05-16 15:58:11 -0700 | [diff] [blame] | 2200 | dst = apply_refspecs(&remote->fetch, refname); |
Junio C Hamano | 91048a9 | 2013-07-09 11:01:06 -0700 | [diff] [blame] | 2201 | if (!dst) |
| 2202 | return -1; /* no tracking ref for refname at remote */ |
brian m. carlson | 34c290a | 2017-10-15 22:06:56 +0000 | [diff] [blame] | 2203 | if (read_ref(dst, oid)) |
Junio C Hamano | 91048a9 | 2013-07-09 11:01:06 -0700 | [diff] [blame] | 2204 | return -1; /* we know what the tracking ref is but we cannot read it */ |
| 2205 | return 0; |
| 2206 | } |
| 2207 | |
| 2208 | static void apply_cas(struct push_cas_option *cas, |
| 2209 | struct remote *remote, |
| 2210 | struct ref *ref) |
| 2211 | { |
| 2212 | int i; |
| 2213 | |
| 2214 | /* Find an explicit --<option>=<name>[:<value>] entry */ |
| 2215 | for (i = 0; i < cas->nr; i++) { |
| 2216 | struct push_cas *entry = &cas->entry[i]; |
Michael Haggerty | 54457fe | 2014-01-14 04:16:07 +0100 | [diff] [blame] | 2217 | if (!refname_match(entry->refname, ref->name)) |
Junio C Hamano | 91048a9 | 2013-07-09 11:01:06 -0700 | [diff] [blame] | 2218 | continue; |
| 2219 | ref->expect_old_sha1 = 1; |
| 2220 | if (!entry->use_tracking) |
brian m. carlson | b8566f8 | 2017-07-13 23:49:21 +0000 | [diff] [blame] | 2221 | oidcpy(&ref->old_oid_expect, &entry->expect); |
brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 +0000 | [diff] [blame] | 2222 | else if (remote_tracking(remote, ref->name, &ref->old_oid_expect)) |
John Keeping | 64ac39a | 2016-07-26 21:44:45 +0100 | [diff] [blame] | 2223 | oidclr(&ref->old_oid_expect); |
Junio C Hamano | 91048a9 | 2013-07-09 11:01:06 -0700 | [diff] [blame] | 2224 | return; |
| 2225 | } |
| 2226 | |
| 2227 | /* Are we using "--<option>" to cover all? */ |
| 2228 | if (!cas->use_tracking_for_rest) |
| 2229 | return; |
| 2230 | |
| 2231 | ref->expect_old_sha1 = 1; |
brian m. carlson | fcd30b1 | 2015-11-10 02:22:30 +0000 | [diff] [blame] | 2232 | if (remote_tracking(remote, ref->name, &ref->old_oid_expect)) |
John Keeping | 64ac39a | 2016-07-26 21:44:45 +0100 | [diff] [blame] | 2233 | oidclr(&ref->old_oid_expect); |
Junio C Hamano | 91048a9 | 2013-07-09 11:01:06 -0700 | [diff] [blame] | 2234 | } |
| 2235 | |
| 2236 | void apply_push_cas(struct push_cas_option *cas, |
| 2237 | struct remote *remote, |
| 2238 | struct ref *remote_refs) |
| 2239 | { |
| 2240 | struct ref *ref; |
| 2241 | for (ref = remote_refs; ref; ref = ref->next) |
| 2242 | apply_cas(cas, remote, ref); |
| 2243 | } |