Introduce CHERRY_PICK_HEAD
[git] / builtin / remote.c
1 #include "cache.h"
2 #include "parse-options.h"
3 #include "transport.h"
4 #include "remote.h"
5 #include "string-list.h"
6 #include "strbuf.h"
7 #include "run-command.h"
8 #include "refs.h"
9
10 static const char * const builtin_remote_usage[] = {
11         "git remote [-v | --verbose]",
12         "git remote add [-t <branch>] [-m <master>] [-f] [--mirror] <name> <url>",
13         "git remote rename <old> <new>",
14         "git remote rm <name>",
15         "git remote set-head <name> (-a | -d | <branch>)",
16         "git remote [-v | --verbose] show [-n] <name>",
17         "git remote prune [-n | --dry-run] <name>",
18         "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]",
19         "git remote set-branches <name> [--add] <branch>...",
20         "git remote set-url <name> <newurl> [<oldurl>]",
21         "git remote set-url --add <name> <newurl>",
22         "git remote set-url --delete <name> <url>",
23         NULL
24 };
25
26 static const char * const builtin_remote_add_usage[] = {
27         "git remote add [<options>] <name> <url>",
28         NULL
29 };
30
31 static const char * const builtin_remote_rename_usage[] = {
32         "git remote rename <old> <new>",
33         NULL
34 };
35
36 static const char * const builtin_remote_rm_usage[] = {
37         "git remote rm <name>",
38         NULL
39 };
40
41 static const char * const builtin_remote_sethead_usage[] = {
42         "git remote set-head <name> (-a | -d | <branch>])",
43         NULL
44 };
45
46 static const char * const builtin_remote_setbranches_usage[] = {
47         "git remote set-branches <name> <branch>...",
48         "git remote set-branches --add <name> <branch>...",
49         NULL
50 };
51
52 static const char * const builtin_remote_show_usage[] = {
53         "git remote show [<options>] <name>",
54         NULL
55 };
56
57 static const char * const builtin_remote_prune_usage[] = {
58         "git remote prune [<options>] <name>",
59         NULL
60 };
61
62 static const char * const builtin_remote_update_usage[] = {
63         "git remote update [<options>] [<group> | <remote>]...",
64         NULL
65 };
66
67 static const char * const builtin_remote_seturl_usage[] = {
68         "git remote set-url [--push] <name> <newurl> [<oldurl>]",
69         "git remote set-url --add <name> <newurl>",
70         "git remote set-url --delete <name> <url>",
71         NULL
72 };
73
74 #define GET_REF_STATES (1<<0)
75 #define GET_HEAD_NAMES (1<<1)
76 #define GET_PUSH_REF_STATES (1<<2)
77
78 static int verbose;
79
80 static int show_all(void);
81 static int prune_remote(const char *remote, int dry_run);
82
83 static inline int postfixcmp(const char *string, const char *postfix)
84 {
85         int len1 = strlen(string), len2 = strlen(postfix);
86         if (len1 < len2)
87                 return 1;
88         return strcmp(string + len1 - len2, postfix);
89 }
90
91 static int opt_parse_track(const struct option *opt, const char *arg, int not)
92 {
93         struct string_list *list = opt->value;
94         if (not)
95                 string_list_clear(list, 0);
96         else
97                 string_list_append(list, arg);
98         return 0;
99 }
100
101 static int fetch_remote(const char *name)
102 {
103         const char *argv[] = { "fetch", name, NULL, NULL };
104         if (verbose) {
105                 argv[1] = "-v";
106                 argv[2] = name;
107         }
108         printf("Updating %s\n", name);
109         if (run_command_v_opt(argv, RUN_GIT_CMD))
110                 return error("Could not fetch %s", name);
111         return 0;
112 }
113
114 enum {
115         TAGS_UNSET = 0,
116         TAGS_DEFAULT = 1,
117         TAGS_SET = 2
118 };
119
120 static int add_branch(const char *key, const char *branchname,
121                 const char *remotename, int mirror, struct strbuf *tmp)
122 {
123         strbuf_reset(tmp);
124         strbuf_addch(tmp, '+');
125         if (mirror)
126                 strbuf_addf(tmp, "refs/%s:refs/%s",
127                                 branchname, branchname);
128         else
129                 strbuf_addf(tmp, "refs/heads/%s:refs/remotes/%s/%s",
130                                 branchname, remotename, branchname);
131         return git_config_set_multivar(key, tmp->buf, "^$", 0);
132 }
133
134 static int add(int argc, const char **argv)
135 {
136         int fetch = 0, mirror = 0, fetch_tags = TAGS_DEFAULT;
137         struct string_list track = STRING_LIST_INIT_NODUP;
138         const char *master = NULL;
139         struct remote *remote;
140         struct strbuf buf = STRBUF_INIT, buf2 = STRBUF_INIT;
141         const char *name, *url;
142         int i;
143
144         struct option options[] = {
145                 OPT_BOOLEAN('f', "fetch", &fetch, "fetch the remote branches"),
146                 OPT_SET_INT(0, "tags", &fetch_tags,
147                             "import all tags and associated objects when fetching",
148                             TAGS_SET),
149                 OPT_SET_INT(0, NULL, &fetch_tags,
150                             "or do not fetch any tag at all (--no-tags)", TAGS_UNSET),
151                 OPT_CALLBACK('t', "track", &track, "branch",
152                         "branch(es) to track", opt_parse_track),
153                 OPT_STRING('m', "master", &master, "branch", "master branch"),
154                 OPT_BOOLEAN(0, "mirror", &mirror, "no separate remotes"),
155                 OPT_END()
156         };
157
158         argc = parse_options(argc, argv, NULL, options, builtin_remote_add_usage,
159                              0);
160
161         if (argc < 2)
162                 usage_with_options(builtin_remote_add_usage, options);
163
164         name = argv[0];
165         url = argv[1];
166
167         remote = remote_get(name);
168         if (remote && (remote->url_nr > 1 || strcmp(name, remote->url[0]) ||
169                         remote->fetch_refspec_nr))
170                 die("remote %s already exists.", name);
171
172         strbuf_addf(&buf2, "refs/heads/test:refs/remotes/%s/test", name);
173         if (!valid_fetch_refspec(buf2.buf))
174                 die("'%s' is not a valid remote name", name);
175
176         strbuf_addf(&buf, "remote.%s.url", name);
177         if (git_config_set(buf.buf, url))
178                 return 1;
179
180         strbuf_reset(&buf);
181         strbuf_addf(&buf, "remote.%s.fetch", name);
182
183         if (track.nr == 0)
184                 string_list_append(&track, "*");
185         for (i = 0; i < track.nr; i++) {
186                 if (add_branch(buf.buf, track.items[i].string,
187                                 name, mirror, &buf2))
188                         return 1;
189         }
190
191         if (mirror) {
192                 strbuf_reset(&buf);
193                 strbuf_addf(&buf, "remote.%s.mirror", name);
194                 if (git_config_set(buf.buf, "true"))
195                         return 1;
196         }
197
198         if (fetch_tags != TAGS_DEFAULT) {
199                 strbuf_reset(&buf);
200                 strbuf_addf(&buf, "remote.%s.tagopt", name);
201                 if (git_config_set(buf.buf,
202                         fetch_tags == TAGS_SET ? "--tags" : "--no-tags"))
203                         return 1;
204         }
205
206         if (fetch && fetch_remote(name))
207                 return 1;
208
209         if (master) {
210                 strbuf_reset(&buf);
211                 strbuf_addf(&buf, "refs/remotes/%s/HEAD", name);
212
213                 strbuf_reset(&buf2);
214                 strbuf_addf(&buf2, "refs/remotes/%s/%s", name, master);
215
216                 if (create_symref(buf.buf, buf2.buf, "remote add"))
217                         return error("Could not setup master '%s'", master);
218         }
219
220         strbuf_release(&buf);
221         strbuf_release(&buf2);
222         string_list_clear(&track, 0);
223
224         return 0;
225 }
226
227 struct branch_info {
228         char *remote_name;
229         struct string_list merge;
230         int rebase;
231 };
232
233 static struct string_list branch_list;
234
235 static const char *abbrev_ref(const char *name, const char *prefix)
236 {
237         const char *abbrev = skip_prefix(name, prefix);
238         if (abbrev)
239                 return abbrev;
240         return name;
241 }
242 #define abbrev_branch(name) abbrev_ref((name), "refs/heads/")
243
244 static int config_read_branches(const char *key, const char *value, void *cb)
245 {
246         if (!prefixcmp(key, "branch.")) {
247                 const char *orig_key = key;
248                 char *name;
249                 struct string_list_item *item;
250                 struct branch_info *info;
251                 enum { REMOTE, MERGE, REBASE } type;
252
253                 key += 7;
254                 if (!postfixcmp(key, ".remote")) {
255                         name = xstrndup(key, strlen(key) - 7);
256                         type = REMOTE;
257                 } else if (!postfixcmp(key, ".merge")) {
258                         name = xstrndup(key, strlen(key) - 6);
259                         type = MERGE;
260                 } else if (!postfixcmp(key, ".rebase")) {
261                         name = xstrndup(key, strlen(key) - 7);
262                         type = REBASE;
263                 } else
264                         return 0;
265
266                 item = string_list_insert(&branch_list, name);
267
268                 if (!item->util)
269                         item->util = xcalloc(sizeof(struct branch_info), 1);
270                 info = item->util;
271                 if (type == REMOTE) {
272                         if (info->remote_name)
273                                 warning("more than one %s", orig_key);
274                         info->remote_name = xstrdup(value);
275                 } else if (type == MERGE) {
276                         char *space = strchr(value, ' ');
277                         value = abbrev_branch(value);
278                         while (space) {
279                                 char *merge;
280                                 merge = xstrndup(value, space - value);
281                                 string_list_append(&info->merge, merge);
282                                 value = abbrev_branch(space + 1);
283                                 space = strchr(value, ' ');
284                         }
285                         string_list_append(&info->merge, xstrdup(value));
286                 } else
287                         info->rebase = git_config_bool(orig_key, value);
288         }
289         return 0;
290 }
291
292 static void read_branches(void)
293 {
294         if (branch_list.nr)
295                 return;
296         git_config(config_read_branches, NULL);
297 }
298
299 struct ref_states {
300         struct remote *remote;
301         struct string_list new, stale, tracked, heads, push;
302         int queried;
303 };
304
305 static int get_ref_states(const struct ref *remote_refs, struct ref_states *states)
306 {
307         struct ref *fetch_map = NULL, **tail = &fetch_map;
308         struct ref *ref, *stale_refs;
309         int i;
310
311         for (i = 0; i < states->remote->fetch_refspec_nr; i++)
312                 if (get_fetch_map(remote_refs, states->remote->fetch + i, &tail, 1))
313                         die("Could not get fetch map for refspec %s",
314                                 states->remote->fetch_refspec[i]);
315
316         states->new.strdup_strings = 1;
317         states->tracked.strdup_strings = 1;
318         states->stale.strdup_strings = 1;
319         for (ref = fetch_map; ref; ref = ref->next) {
320                 unsigned char sha1[20];
321                 if (!ref->peer_ref || read_ref(ref->peer_ref->name, sha1))
322                         string_list_append(&states->new, abbrev_branch(ref->name));
323                 else
324                         string_list_append(&states->tracked, abbrev_branch(ref->name));
325         }
326         stale_refs = get_stale_heads(states->remote, fetch_map);
327         for (ref = stale_refs; ref; ref = ref->next) {
328                 struct string_list_item *item =
329                         string_list_append(&states->stale, abbrev_branch(ref->name));
330                 item->util = xstrdup(ref->name);
331         }
332         free_refs(stale_refs);
333         free_refs(fetch_map);
334
335         sort_string_list(&states->new);
336         sort_string_list(&states->tracked);
337         sort_string_list(&states->stale);
338
339         return 0;
340 }
341
342 struct push_info {
343         char *dest;
344         int forced;
345         enum {
346                 PUSH_STATUS_CREATE = 0,
347                 PUSH_STATUS_DELETE,
348                 PUSH_STATUS_UPTODATE,
349                 PUSH_STATUS_FASTFORWARD,
350                 PUSH_STATUS_OUTOFDATE,
351                 PUSH_STATUS_NOTQUERIED
352         } status;
353 };
354
355 static int get_push_ref_states(const struct ref *remote_refs,
356         struct ref_states *states)
357 {
358         struct remote *remote = states->remote;
359         struct ref *ref, *local_refs, *push_map;
360         if (remote->mirror)
361                 return 0;
362
363         local_refs = get_local_heads();
364         push_map = copy_ref_list(remote_refs);
365
366         match_refs(local_refs, &push_map, remote->push_refspec_nr,
367                    remote->push_refspec, MATCH_REFS_NONE);
368
369         states->push.strdup_strings = 1;
370         for (ref = push_map; ref; ref = ref->next) {
371                 struct string_list_item *item;
372                 struct push_info *info;
373
374                 if (!ref->peer_ref)
375                         continue;
376                 hashcpy(ref->new_sha1, ref->peer_ref->new_sha1);
377
378                 item = string_list_append(&states->push,
379                                           abbrev_branch(ref->peer_ref->name));
380                 item->util = xcalloc(sizeof(struct push_info), 1);
381                 info = item->util;
382                 info->forced = ref->force;
383                 info->dest = xstrdup(abbrev_branch(ref->name));
384
385                 if (is_null_sha1(ref->new_sha1)) {
386                         info->status = PUSH_STATUS_DELETE;
387                 } else if (!hashcmp(ref->old_sha1, ref->new_sha1))
388                         info->status = PUSH_STATUS_UPTODATE;
389                 else if (is_null_sha1(ref->old_sha1))
390                         info->status = PUSH_STATUS_CREATE;
391                 else if (has_sha1_file(ref->old_sha1) &&
392                          ref_newer(ref->new_sha1, ref->old_sha1))
393                         info->status = PUSH_STATUS_FASTFORWARD;
394                 else
395                         info->status = PUSH_STATUS_OUTOFDATE;
396         }
397         free_refs(local_refs);
398         free_refs(push_map);
399         return 0;
400 }
401
402 static int get_push_ref_states_noquery(struct ref_states *states)
403 {
404         int i;
405         struct remote *remote = states->remote;
406         struct string_list_item *item;
407         struct push_info *info;
408
409         if (remote->mirror)
410                 return 0;
411
412         states->push.strdup_strings = 1;
413         if (!remote->push_refspec_nr) {
414                 item = string_list_append(&states->push, "(matching)");
415                 info = item->util = xcalloc(sizeof(struct push_info), 1);
416                 info->status = PUSH_STATUS_NOTQUERIED;
417                 info->dest = xstrdup(item->string);
418         }
419         for (i = 0; i < remote->push_refspec_nr; i++) {
420                 struct refspec *spec = remote->push + i;
421                 if (spec->matching)
422                         item = string_list_append(&states->push, "(matching)");
423                 else if (strlen(spec->src))
424                         item = string_list_append(&states->push, spec->src);
425                 else
426                         item = string_list_append(&states->push, "(delete)");
427
428                 info = item->util = xcalloc(sizeof(struct push_info), 1);
429                 info->forced = spec->force;
430                 info->status = PUSH_STATUS_NOTQUERIED;
431                 info->dest = xstrdup(spec->dst ? spec->dst : item->string);
432         }
433         return 0;
434 }
435
436 static int get_head_names(const struct ref *remote_refs, struct ref_states *states)
437 {
438         struct ref *ref, *matches;
439         struct ref *fetch_map = NULL, **fetch_map_tail = &fetch_map;
440         struct refspec refspec;
441
442         refspec.force = 0;
443         refspec.pattern = 1;
444         refspec.src = refspec.dst = "refs/heads/*";
445         states->heads.strdup_strings = 1;
446         get_fetch_map(remote_refs, &refspec, &fetch_map_tail, 0);
447         matches = guess_remote_head(find_ref_by_name(remote_refs, "HEAD"),
448                                     fetch_map, 1);
449         for (ref = matches; ref; ref = ref->next)
450                 string_list_append(&states->heads, abbrev_branch(ref->name));
451
452         free_refs(fetch_map);
453         free_refs(matches);
454
455         return 0;
456 }
457
458 struct known_remote {
459         struct known_remote *next;
460         struct remote *remote;
461 };
462
463 struct known_remotes {
464         struct remote *to_delete;
465         struct known_remote *list;
466 };
467
468 static int add_known_remote(struct remote *remote, void *cb_data)
469 {
470         struct known_remotes *all = cb_data;
471         struct known_remote *r;
472
473         if (!strcmp(all->to_delete->name, remote->name))
474                 return 0;
475
476         r = xmalloc(sizeof(*r));
477         r->remote = remote;
478         r->next = all->list;
479         all->list = r;
480         return 0;
481 }
482
483 struct branches_for_remote {
484         struct remote *remote;
485         struct string_list *branches, *skipped;
486         struct known_remotes *keep;
487 };
488
489 static int add_branch_for_removal(const char *refname,
490         const unsigned char *sha1, int flags, void *cb_data)
491 {
492         struct branches_for_remote *branches = cb_data;
493         struct refspec refspec;
494         struct string_list_item *item;
495         struct known_remote *kr;
496
497         memset(&refspec, 0, sizeof(refspec));
498         refspec.dst = (char *)refname;
499         if (remote_find_tracking(branches->remote, &refspec))
500                 return 0;
501
502         /* don't delete a branch if another remote also uses it */
503         for (kr = branches->keep->list; kr; kr = kr->next) {
504                 memset(&refspec, 0, sizeof(refspec));
505                 refspec.dst = (char *)refname;
506                 if (!remote_find_tracking(kr->remote, &refspec))
507                         return 0;
508         }
509
510         /* don't delete non-remote-tracking refs */
511         if (prefixcmp(refname, "refs/remotes")) {
512                 /* advise user how to delete local branches */
513                 if (!prefixcmp(refname, "refs/heads/"))
514                         string_list_append(branches->skipped,
515                                            abbrev_branch(refname));
516                 /* silently skip over other non-remote refs */
517                 return 0;
518         }
519
520         /* make sure that symrefs are deleted */
521         if (flags & REF_ISSYMREF)
522                 return unlink(git_path("%s", refname));
523
524         item = string_list_append(branches->branches, refname);
525         item->util = xmalloc(20);
526         hashcpy(item->util, sha1);
527
528         return 0;
529 }
530
531 struct rename_info {
532         const char *old;
533         const char *new;
534         struct string_list *remote_branches;
535 };
536
537 static int read_remote_branches(const char *refname,
538         const unsigned char *sha1, int flags, void *cb_data)
539 {
540         struct rename_info *rename = cb_data;
541         struct strbuf buf = STRBUF_INIT;
542         struct string_list_item *item;
543         int flag;
544         unsigned char orig_sha1[20];
545         const char *symref;
546
547         strbuf_addf(&buf, "refs/remotes/%s", rename->old);
548         if (!prefixcmp(refname, buf.buf)) {
549                 item = string_list_append(rename->remote_branches, xstrdup(refname));
550                 symref = resolve_ref(refname, orig_sha1, 1, &flag);
551                 if (flag & REF_ISSYMREF)
552                         item->util = xstrdup(symref);
553                 else
554                         item->util = NULL;
555         }
556
557         return 0;
558 }
559
560 static int migrate_file(struct remote *remote)
561 {
562         struct strbuf buf = STRBUF_INIT;
563         int i;
564         char *path = NULL;
565
566         strbuf_addf(&buf, "remote.%s.url", remote->name);
567         for (i = 0; i < remote->url_nr; i++)
568                 if (git_config_set_multivar(buf.buf, remote->url[i], "^$", 0))
569                         return error("Could not append '%s' to '%s'",
570                                         remote->url[i], buf.buf);
571         strbuf_reset(&buf);
572         strbuf_addf(&buf, "remote.%s.push", remote->name);
573         for (i = 0; i < remote->push_refspec_nr; i++)
574                 if (git_config_set_multivar(buf.buf, remote->push_refspec[i], "^$", 0))
575                         return error("Could not append '%s' to '%s'",
576                                         remote->push_refspec[i], buf.buf);
577         strbuf_reset(&buf);
578         strbuf_addf(&buf, "remote.%s.fetch", remote->name);
579         for (i = 0; i < remote->fetch_refspec_nr; i++)
580                 if (git_config_set_multivar(buf.buf, remote->fetch_refspec[i], "^$", 0))
581                         return error("Could not append '%s' to '%s'",
582                                         remote->fetch_refspec[i], buf.buf);
583         if (remote->origin == REMOTE_REMOTES)
584                 path = git_path("remotes/%s", remote->name);
585         else if (remote->origin == REMOTE_BRANCHES)
586                 path = git_path("branches/%s", remote->name);
587         if (path)
588                 unlink_or_warn(path);
589         return 0;
590 }
591
592 static int mv(int argc, const char **argv)
593 {
594         struct option options[] = {
595                 OPT_END()
596         };
597         struct remote *oldremote, *newremote;
598         struct strbuf buf = STRBUF_INIT, buf2 = STRBUF_INIT, buf3 = STRBUF_INIT;
599         struct string_list remote_branches = STRING_LIST_INIT_NODUP;
600         struct rename_info rename;
601         int i;
602
603         if (argc != 3)
604                 usage_with_options(builtin_remote_rename_usage, options);
605
606         rename.old = argv[1];
607         rename.new = argv[2];
608         rename.remote_branches = &remote_branches;
609
610         oldremote = remote_get(rename.old);
611         if (!oldremote)
612                 die("No such remote: %s", rename.old);
613
614         if (!strcmp(rename.old, rename.new) && oldremote->origin != REMOTE_CONFIG)
615                 return migrate_file(oldremote);
616
617         newremote = remote_get(rename.new);
618         if (newremote && (newremote->url_nr > 1 || newremote->fetch_refspec_nr))
619                 die("remote %s already exists.", rename.new);
620
621         strbuf_addf(&buf, "refs/heads/test:refs/remotes/%s/test", rename.new);
622         if (!valid_fetch_refspec(buf.buf))
623                 die("'%s' is not a valid remote name", rename.new);
624
625         strbuf_reset(&buf);
626         strbuf_addf(&buf, "remote.%s", rename.old);
627         strbuf_addf(&buf2, "remote.%s", rename.new);
628         if (git_config_rename_section(buf.buf, buf2.buf) < 1)
629                 return error("Could not rename config section '%s' to '%s'",
630                                 buf.buf, buf2.buf);
631
632         strbuf_reset(&buf);
633         strbuf_addf(&buf, "remote.%s.fetch", rename.new);
634         if (git_config_set_multivar(buf.buf, NULL, NULL, 1))
635                 return error("Could not remove config section '%s'", buf.buf);
636         for (i = 0; i < oldremote->fetch_refspec_nr; i++) {
637                 char *ptr;
638
639                 strbuf_reset(&buf2);
640                 strbuf_addstr(&buf2, oldremote->fetch_refspec[i]);
641                 ptr = strstr(buf2.buf, rename.old);
642                 if (ptr)
643                         strbuf_splice(&buf2, ptr-buf2.buf, strlen(rename.old),
644                                         rename.new, strlen(rename.new));
645                 if (git_config_set_multivar(buf.buf, buf2.buf, "^$", 0))
646                         return error("Could not append '%s'", buf.buf);
647         }
648
649         read_branches();
650         for (i = 0; i < branch_list.nr; i++) {
651                 struct string_list_item *item = branch_list.items + i;
652                 struct branch_info *info = item->util;
653                 if (info->remote_name && !strcmp(info->remote_name, rename.old)) {
654                         strbuf_reset(&buf);
655                         strbuf_addf(&buf, "branch.%s.remote", item->string);
656                         if (git_config_set(buf.buf, rename.new)) {
657                                 return error("Could not set '%s'", buf.buf);
658                         }
659                 }
660         }
661
662         /*
663          * First remove symrefs, then rename the rest, finally create
664          * the new symrefs.
665          */
666         for_each_ref(read_remote_branches, &rename);
667         for (i = 0; i < remote_branches.nr; i++) {
668                 struct string_list_item *item = remote_branches.items + i;
669                 int flag = 0;
670                 unsigned char sha1[20];
671
672                 resolve_ref(item->string, sha1, 1, &flag);
673                 if (!(flag & REF_ISSYMREF))
674                         continue;
675                 if (delete_ref(item->string, NULL, REF_NODEREF))
676                         die("deleting '%s' failed", item->string);
677         }
678         for (i = 0; i < remote_branches.nr; i++) {
679                 struct string_list_item *item = remote_branches.items + i;
680
681                 if (item->util)
682                         continue;
683                 strbuf_reset(&buf);
684                 strbuf_addstr(&buf, item->string);
685                 strbuf_splice(&buf, strlen("refs/remotes/"), strlen(rename.old),
686                                 rename.new, strlen(rename.new));
687                 strbuf_reset(&buf2);
688                 strbuf_addf(&buf2, "remote: renamed %s to %s",
689                                 item->string, buf.buf);
690                 if (rename_ref(item->string, buf.buf, buf2.buf))
691                         die("renaming '%s' failed", item->string);
692         }
693         for (i = 0; i < remote_branches.nr; i++) {
694                 struct string_list_item *item = remote_branches.items + i;
695
696                 if (!item->util)
697                         continue;
698                 strbuf_reset(&buf);
699                 strbuf_addstr(&buf, item->string);
700                 strbuf_splice(&buf, strlen("refs/remotes/"), strlen(rename.old),
701                                 rename.new, strlen(rename.new));
702                 strbuf_reset(&buf2);
703                 strbuf_addstr(&buf2, item->util);
704                 strbuf_splice(&buf2, strlen("refs/remotes/"), strlen(rename.old),
705                                 rename.new, strlen(rename.new));
706                 strbuf_reset(&buf3);
707                 strbuf_addf(&buf3, "remote: renamed %s to %s",
708                                 item->string, buf.buf);
709                 if (create_symref(buf.buf, buf2.buf, buf3.buf))
710                         die("creating '%s' failed", buf.buf);
711         }
712         return 0;
713 }
714
715 static int remove_branches(struct string_list *branches)
716 {
717         int i, result = 0;
718         for (i = 0; i < branches->nr; i++) {
719                 struct string_list_item *item = branches->items + i;
720                 const char *refname = item->string;
721                 unsigned char *sha1 = item->util;
722
723                 if (delete_ref(refname, sha1, 0))
724                         result |= error("Could not remove branch %s", refname);
725         }
726         return result;
727 }
728
729 static int rm(int argc, const char **argv)
730 {
731         struct option options[] = {
732                 OPT_END()
733         };
734         struct remote *remote;
735         struct strbuf buf = STRBUF_INIT;
736         struct known_remotes known_remotes = { NULL, NULL };
737         struct string_list branches = STRING_LIST_INIT_DUP;
738         struct string_list skipped = STRING_LIST_INIT_DUP;
739         struct branches_for_remote cb_data;
740         int i, result;
741
742         memset(&cb_data, 0, sizeof(cb_data));
743         cb_data.branches = &branches;
744         cb_data.skipped = &skipped;
745         cb_data.keep = &known_remotes;
746
747         if (argc != 2)
748                 usage_with_options(builtin_remote_rm_usage, options);
749
750         remote = remote_get(argv[1]);
751         if (!remote)
752                 die("No such remote: %s", argv[1]);
753
754         known_remotes.to_delete = remote;
755         for_each_remote(add_known_remote, &known_remotes);
756
757         strbuf_addf(&buf, "remote.%s", remote->name);
758         if (git_config_rename_section(buf.buf, NULL) < 1)
759                 return error("Could not remove config section '%s'", buf.buf);
760
761         read_branches();
762         for (i = 0; i < branch_list.nr; i++) {
763                 struct string_list_item *item = branch_list.items + i;
764                 struct branch_info *info = item->util;
765                 if (info->remote_name && !strcmp(info->remote_name, remote->name)) {
766                         const char *keys[] = { "remote", "merge", NULL }, **k;
767                         for (k = keys; *k; k++) {
768                                 strbuf_reset(&buf);
769                                 strbuf_addf(&buf, "branch.%s.%s",
770                                                 item->string, *k);
771                                 if (git_config_set(buf.buf, NULL)) {
772                                         strbuf_release(&buf);
773                                         return -1;
774                                 }
775                         }
776                 }
777         }
778
779         /*
780          * We cannot just pass a function to for_each_ref() which deletes
781          * the branches one by one, since for_each_ref() relies on cached
782          * refs, which are invalidated when deleting a branch.
783          */
784         cb_data.remote = remote;
785         result = for_each_ref(add_branch_for_removal, &cb_data);
786         strbuf_release(&buf);
787
788         if (!result)
789                 result = remove_branches(&branches);
790         string_list_clear(&branches, 1);
791
792         if (skipped.nr) {
793                 fprintf(stderr, skipped.nr == 1 ?
794                         "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
795                         "to delete it, use:\n" :
796                         "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
797                         "to delete them, use:\n");
798                 for (i = 0; i < skipped.nr; i++)
799                         fprintf(stderr, "  git branch -d %s\n",
800                                 skipped.items[i].string);
801         }
802         string_list_clear(&skipped, 0);
803
804         return result;
805 }
806
807 static void clear_push_info(void *util, const char *string)
808 {
809         struct push_info *info = util;
810         free(info->dest);
811         free(info);
812 }
813
814 static void free_remote_ref_states(struct ref_states *states)
815 {
816         string_list_clear(&states->new, 0);
817         string_list_clear(&states->stale, 1);
818         string_list_clear(&states->tracked, 0);
819         string_list_clear(&states->heads, 0);
820         string_list_clear_func(&states->push, clear_push_info);
821 }
822
823 static int append_ref_to_tracked_list(const char *refname,
824         const unsigned char *sha1, int flags, void *cb_data)
825 {
826         struct ref_states *states = cb_data;
827         struct refspec refspec;
828
829         if (flags & REF_ISSYMREF)
830                 return 0;
831
832         memset(&refspec, 0, sizeof(refspec));
833         refspec.dst = (char *)refname;
834         if (!remote_find_tracking(states->remote, &refspec))
835                 string_list_append(&states->tracked, abbrev_branch(refspec.src));
836
837         return 0;
838 }
839
840 static int get_remote_ref_states(const char *name,
841                                  struct ref_states *states,
842                                  int query)
843 {
844         struct transport *transport;
845         const struct ref *remote_refs;
846
847         states->remote = remote_get(name);
848         if (!states->remote)
849                 return error("No such remote: %s", name);
850
851         read_branches();
852
853         if (query) {
854                 transport = transport_get(states->remote, states->remote->url_nr > 0 ?
855                         states->remote->url[0] : NULL);
856                 remote_refs = transport_get_remote_refs(transport);
857                 transport_disconnect(transport);
858
859                 states->queried = 1;
860                 if (query & GET_REF_STATES)
861                         get_ref_states(remote_refs, states);
862                 if (query & GET_HEAD_NAMES)
863                         get_head_names(remote_refs, states);
864                 if (query & GET_PUSH_REF_STATES)
865                         get_push_ref_states(remote_refs, states);
866         } else {
867                 for_each_ref(append_ref_to_tracked_list, states);
868                 sort_string_list(&states->tracked);
869                 get_push_ref_states_noquery(states);
870         }
871
872         return 0;
873 }
874
875 struct show_info {
876         struct string_list *list;
877         struct ref_states *states;
878         int width, width2;
879         int any_rebase;
880 };
881
882 static int add_remote_to_show_info(struct string_list_item *item, void *cb_data)
883 {
884         struct show_info *info = cb_data;
885         int n = strlen(item->string);
886         if (n > info->width)
887                 info->width = n;
888         string_list_insert(info->list, item->string);
889         return 0;
890 }
891
892 static int show_remote_info_item(struct string_list_item *item, void *cb_data)
893 {
894         struct show_info *info = cb_data;
895         struct ref_states *states = info->states;
896         const char *name = item->string;
897
898         if (states->queried) {
899                 const char *fmt = "%s";
900                 const char *arg = "";
901                 if (string_list_has_string(&states->new, name)) {
902                         fmt = " new (next fetch will store in remotes/%s)";
903                         arg = states->remote->name;
904                 } else if (string_list_has_string(&states->tracked, name))
905                         arg = " tracked";
906                 else if (string_list_has_string(&states->stale, name))
907                         arg = " stale (use 'git remote prune' to remove)";
908                 else
909                         arg = " ???";
910                 printf("    %-*s", info->width, name);
911                 printf(fmt, arg);
912                 printf("\n");
913         } else
914                 printf("    %s\n", name);
915
916         return 0;
917 }
918
919 static int add_local_to_show_info(struct string_list_item *branch_item, void *cb_data)
920 {
921         struct show_info *show_info = cb_data;
922         struct ref_states *states = show_info->states;
923         struct branch_info *branch_info = branch_item->util;
924         struct string_list_item *item;
925         int n;
926
927         if (!branch_info->merge.nr || !branch_info->remote_name ||
928             strcmp(states->remote->name, branch_info->remote_name))
929                 return 0;
930         if ((n = strlen(branch_item->string)) > show_info->width)
931                 show_info->width = n;
932         if (branch_info->rebase)
933                 show_info->any_rebase = 1;
934
935         item = string_list_insert(show_info->list, branch_item->string);
936         item->util = branch_info;
937
938         return 0;
939 }
940
941 static int show_local_info_item(struct string_list_item *item, void *cb_data)
942 {
943         struct show_info *show_info = cb_data;
944         struct branch_info *branch_info = item->util;
945         struct string_list *merge = &branch_info->merge;
946         const char *also;
947         int i;
948
949         if (branch_info->rebase && branch_info->merge.nr > 1) {
950                 error("invalid branch.%s.merge; cannot rebase onto > 1 branch",
951                         item->string);
952                 return 0;
953         }
954
955         printf("    %-*s ", show_info->width, item->string);
956         if (branch_info->rebase) {
957                 printf("rebases onto remote %s\n", merge->items[0].string);
958                 return 0;
959         } else if (show_info->any_rebase) {
960                 printf(" merges with remote %s\n", merge->items[0].string);
961                 also = "    and with remote";
962         } else {
963                 printf("merges with remote %s\n", merge->items[0].string);
964                 also = "   and with remote";
965         }
966         for (i = 1; i < merge->nr; i++)
967                 printf("    %-*s %s %s\n", show_info->width, "", also,
968                        merge->items[i].string);
969
970         return 0;
971 }
972
973 static int add_push_to_show_info(struct string_list_item *push_item, void *cb_data)
974 {
975         struct show_info *show_info = cb_data;
976         struct push_info *push_info = push_item->util;
977         struct string_list_item *item;
978         int n;
979         if ((n = strlen(push_item->string)) > show_info->width)
980                 show_info->width = n;
981         if ((n = strlen(push_info->dest)) > show_info->width2)
982                 show_info->width2 = n;
983         item = string_list_append(show_info->list, push_item->string);
984         item->util = push_item->util;
985         return 0;
986 }
987
988 /*
989  * Sorting comparison for a string list that has push_info
990  * structs in its util field
991  */
992 static int cmp_string_with_push(const void *va, const void *vb)
993 {
994         const struct string_list_item *a = va;
995         const struct string_list_item *b = vb;
996         const struct push_info *a_push = a->util;
997         const struct push_info *b_push = b->util;
998         int cmp = strcmp(a->string, b->string);
999         return cmp ? cmp : strcmp(a_push->dest, b_push->dest);
1000 }
1001
1002 static int show_push_info_item(struct string_list_item *item, void *cb_data)
1003 {
1004         struct show_info *show_info = cb_data;
1005         struct push_info *push_info = item->util;
1006         char *src = item->string, *status = NULL;
1007
1008         switch (push_info->status) {
1009         case PUSH_STATUS_CREATE:
1010                 status = "create";
1011                 break;
1012         case PUSH_STATUS_DELETE:
1013                 status = "delete";
1014                 src = "(none)";
1015                 break;
1016         case PUSH_STATUS_UPTODATE:
1017                 status = "up to date";
1018                 break;
1019         case PUSH_STATUS_FASTFORWARD:
1020                 status = "fast-forwardable";
1021                 break;
1022         case PUSH_STATUS_OUTOFDATE:
1023                 status = "local out of date";
1024                 break;
1025         case PUSH_STATUS_NOTQUERIED:
1026                 break;
1027         }
1028         if (status)
1029                 printf("    %-*s %s to %-*s (%s)\n", show_info->width, src,
1030                         push_info->forced ? "forces" : "pushes",
1031                         show_info->width2, push_info->dest, status);
1032         else
1033                 printf("    %-*s %s to %s\n", show_info->width, src,
1034                         push_info->forced ? "forces" : "pushes",
1035                         push_info->dest);
1036         return 0;
1037 }
1038
1039 static int show(int argc, const char **argv)
1040 {
1041         int no_query = 0, result = 0, query_flag = 0;
1042         struct option options[] = {
1043                 OPT_BOOLEAN('n', NULL, &no_query, "do not query remotes"),
1044                 OPT_END()
1045         };
1046         struct ref_states states;
1047         struct string_list info_list = STRING_LIST_INIT_NODUP;
1048         struct show_info info;
1049
1050         argc = parse_options(argc, argv, NULL, options, builtin_remote_show_usage,
1051                              0);
1052
1053         if (argc < 1)
1054                 return show_all();
1055
1056         if (!no_query)
1057                 query_flag = (GET_REF_STATES | GET_HEAD_NAMES | GET_PUSH_REF_STATES);
1058
1059         memset(&states, 0, sizeof(states));
1060         memset(&info, 0, sizeof(info));
1061         info.states = &states;
1062         info.list = &info_list;
1063         for (; argc; argc--, argv++) {
1064                 int i;
1065                 const char **url;
1066                 int url_nr;
1067
1068                 get_remote_ref_states(*argv, &states, query_flag);
1069
1070                 printf("* remote %s\n", *argv);
1071                 printf("  Fetch URL: %s\n", states.remote->url_nr > 0 ?
1072                         states.remote->url[0] : "(no URL)");
1073                 if (states.remote->pushurl_nr) {
1074                         url = states.remote->pushurl;
1075                         url_nr = states.remote->pushurl_nr;
1076                 } else {
1077                         url = states.remote->url;
1078                         url_nr = states.remote->url_nr;
1079                 }
1080                 for (i=0; i < url_nr; i++)
1081                         printf("  Push  URL: %s\n", url[i]);
1082                 if (!i)
1083                         printf("  Push  URL: %s\n", "(no URL)");
1084                 if (no_query)
1085                         printf("  HEAD branch: (not queried)\n");
1086                 else if (!states.heads.nr)
1087                         printf("  HEAD branch: (unknown)\n");
1088                 else if (states.heads.nr == 1)
1089                         printf("  HEAD branch: %s\n", states.heads.items[0].string);
1090                 else {
1091                         printf("  HEAD branch (remote HEAD is ambiguous,"
1092                                " may be one of the following):\n");
1093                         for (i = 0; i < states.heads.nr; i++)
1094                                 printf("    %s\n", states.heads.items[i].string);
1095                 }
1096
1097                 /* remote branch info */
1098                 info.width = 0;
1099                 for_each_string_list(&states.new, add_remote_to_show_info, &info);
1100                 for_each_string_list(&states.tracked, add_remote_to_show_info, &info);
1101                 for_each_string_list(&states.stale, add_remote_to_show_info, &info);
1102                 if (info.list->nr)
1103                         printf("  Remote branch%s:%s\n",
1104                                info.list->nr > 1 ? "es" : "",
1105                                 no_query ? " (status not queried)" : "");
1106                 for_each_string_list(info.list, show_remote_info_item, &info);
1107                 string_list_clear(info.list, 0);
1108
1109                 /* git pull info */
1110                 info.width = 0;
1111                 info.any_rebase = 0;
1112                 for_each_string_list(&branch_list, add_local_to_show_info, &info);
1113                 if (info.list->nr)
1114                         printf("  Local branch%s configured for 'git pull':\n",
1115                                info.list->nr > 1 ? "es" : "");
1116                 for_each_string_list(info.list, show_local_info_item, &info);
1117                 string_list_clear(info.list, 0);
1118
1119                 /* git push info */
1120                 if (states.remote->mirror)
1121                         printf("  Local refs will be mirrored by 'git push'\n");
1122
1123                 info.width = info.width2 = 0;
1124                 for_each_string_list(&states.push, add_push_to_show_info, &info);
1125                 qsort(info.list->items, info.list->nr,
1126                         sizeof(*info.list->items), cmp_string_with_push);
1127                 if (info.list->nr)
1128                         printf("  Local ref%s configured for 'git push'%s:\n",
1129                                 info.list->nr > 1 ? "s" : "",
1130                                 no_query ? " (status not queried)" : "");
1131                 for_each_string_list(info.list, show_push_info_item, &info);
1132                 string_list_clear(info.list, 0);
1133
1134                 free_remote_ref_states(&states);
1135         }
1136
1137         return result;
1138 }
1139
1140 static int set_head(int argc, const char **argv)
1141 {
1142         int i, opt_a = 0, opt_d = 0, result = 0;
1143         struct strbuf buf = STRBUF_INIT, buf2 = STRBUF_INIT;
1144         char *head_name = NULL;
1145
1146         struct option options[] = {
1147                 OPT_BOOLEAN('a', "auto", &opt_a,
1148                             "set refs/remotes/<name>/HEAD according to remote"),
1149                 OPT_BOOLEAN('d', "delete", &opt_d,
1150                             "delete refs/remotes/<name>/HEAD"),
1151                 OPT_END()
1152         };
1153         argc = parse_options(argc, argv, NULL, options, builtin_remote_sethead_usage,
1154                              0);
1155         if (argc)
1156                 strbuf_addf(&buf, "refs/remotes/%s/HEAD", argv[0]);
1157
1158         if (!opt_a && !opt_d && argc == 2) {
1159                 head_name = xstrdup(argv[1]);
1160         } else if (opt_a && !opt_d && argc == 1) {
1161                 struct ref_states states;
1162                 memset(&states, 0, sizeof(states));
1163                 get_remote_ref_states(argv[0], &states, GET_HEAD_NAMES);
1164                 if (!states.heads.nr)
1165                         result |= error("Cannot determine remote HEAD");
1166                 else if (states.heads.nr > 1) {
1167                         result |= error("Multiple remote HEAD branches. "
1168                                         "Please choose one explicitly with:");
1169                         for (i = 0; i < states.heads.nr; i++)
1170                                 fprintf(stderr, "  git remote set-head %s %s\n",
1171                                         argv[0], states.heads.items[i].string);
1172                 } else
1173                         head_name = xstrdup(states.heads.items[0].string);
1174                 free_remote_ref_states(&states);
1175         } else if (opt_d && !opt_a && argc == 1) {
1176                 if (delete_ref(buf.buf, NULL, REF_NODEREF))
1177                         result |= error("Could not delete %s", buf.buf);
1178         } else
1179                 usage_with_options(builtin_remote_sethead_usage, options);
1180
1181         if (head_name) {
1182                 unsigned char sha1[20];
1183                 strbuf_addf(&buf2, "refs/remotes/%s/%s", argv[0], head_name);
1184                 /* make sure it's valid */
1185                 if (!resolve_ref(buf2.buf, sha1, 1, NULL))
1186                         result |= error("Not a valid ref: %s", buf2.buf);
1187                 else if (create_symref(buf.buf, buf2.buf, "remote set-head"))
1188                         result |= error("Could not setup %s", buf.buf);
1189                 if (opt_a)
1190                         printf("%s/HEAD set to %s\n", argv[0], head_name);
1191                 free(head_name);
1192         }
1193
1194         strbuf_release(&buf);
1195         strbuf_release(&buf2);
1196         return result;
1197 }
1198
1199 static int prune(int argc, const char **argv)
1200 {
1201         int dry_run = 0, result = 0;
1202         struct option options[] = {
1203                 OPT__DRY_RUN(&dry_run, "dry run"),
1204                 OPT_END()
1205         };
1206
1207         argc = parse_options(argc, argv, NULL, options, builtin_remote_prune_usage,
1208                              0);
1209
1210         if (argc < 1)
1211                 usage_with_options(builtin_remote_prune_usage, options);
1212
1213         for (; argc; argc--, argv++)
1214                 result |= prune_remote(*argv, dry_run);
1215
1216         return result;
1217 }
1218
1219 static int prune_remote(const char *remote, int dry_run)
1220 {
1221         int result = 0, i;
1222         struct ref_states states;
1223         const char *dangling_msg = dry_run
1224                 ? " %s will become dangling!\n"
1225                 : " %s has become dangling!\n";
1226
1227         memset(&states, 0, sizeof(states));
1228         get_remote_ref_states(remote, &states, GET_REF_STATES);
1229
1230         if (states.stale.nr) {
1231                 printf("Pruning %s\n", remote);
1232                 printf("URL: %s\n",
1233                        states.remote->url_nr
1234                        ? states.remote->url[0]
1235                        : "(no URL)");
1236         }
1237
1238         for (i = 0; i < states.stale.nr; i++) {
1239                 const char *refname = states.stale.items[i].util;
1240
1241                 if (!dry_run)
1242                         result |= delete_ref(refname, NULL, 0);
1243
1244                 printf(" * [%s] %s\n", dry_run ? "would prune" : "pruned",
1245                        abbrev_ref(refname, "refs/remotes/"));
1246                 warn_dangling_symref(stdout, dangling_msg, refname);
1247         }
1248
1249         free_remote_ref_states(&states);
1250         return result;
1251 }
1252
1253 static int get_remote_default(const char *key, const char *value, void *priv)
1254 {
1255         if (strcmp(key, "remotes.default") == 0) {
1256                 int *found = priv;
1257                 *found = 1;
1258         }
1259         return 0;
1260 }
1261
1262 static int update(int argc, const char **argv)
1263 {
1264         int i, prune = 0;
1265         struct option options[] = {
1266                 OPT_BOOLEAN('p', "prune", &prune,
1267                             "prune remotes after fetching"),
1268                 OPT_END()
1269         };
1270         const char **fetch_argv;
1271         int fetch_argc = 0;
1272         int default_defined = 0;
1273
1274         fetch_argv = xmalloc(sizeof(char *) * (argc+5));
1275
1276         argc = parse_options(argc, argv, NULL, options, builtin_remote_update_usage,
1277                              PARSE_OPT_KEEP_ARGV0);
1278
1279         fetch_argv[fetch_argc++] = "fetch";
1280
1281         if (prune)
1282                 fetch_argv[fetch_argc++] = "--prune";
1283         if (verbose)
1284                 fetch_argv[fetch_argc++] = "-v";
1285         fetch_argv[fetch_argc++] = "--multiple";
1286         if (argc < 2)
1287                 fetch_argv[fetch_argc++] = "default";
1288         for (i = 1; i < argc; i++)
1289                 fetch_argv[fetch_argc++] = argv[i];
1290
1291         if (strcmp(fetch_argv[fetch_argc-1], "default") == 0) {
1292                 git_config(get_remote_default, &default_defined);
1293                 if (!default_defined)
1294                         fetch_argv[fetch_argc-1] = "--all";
1295         }
1296
1297         fetch_argv[fetch_argc] = NULL;
1298
1299         return run_command_v_opt(fetch_argv, RUN_GIT_CMD);
1300 }
1301
1302 static int remove_all_fetch_refspecs(const char *remote, const char *key)
1303 {
1304         return git_config_set_multivar(key, NULL, NULL, 1);
1305 }
1306
1307 static int add_branches(struct remote *remote, const char **branches,
1308                         const char *key)
1309 {
1310         const char *remotename = remote->name;
1311         int mirror = remote->mirror;
1312         struct strbuf refspec = STRBUF_INIT;
1313
1314         for (; *branches; branches++)
1315                 if (add_branch(key, *branches, remotename, mirror, &refspec)) {
1316                         strbuf_release(&refspec);
1317                         return 1;
1318                 }
1319
1320         strbuf_release(&refspec);
1321         return 0;
1322 }
1323
1324 static int set_remote_branches(const char *remotename, const char **branches,
1325                                 int add_mode)
1326 {
1327         struct strbuf key = STRBUF_INIT;
1328         struct remote *remote;
1329
1330         strbuf_addf(&key, "remote.%s.fetch", remotename);
1331
1332         if (!remote_is_configured(remotename))
1333                 die("No such remote '%s'", remotename);
1334         remote = remote_get(remotename);
1335
1336         if (!add_mode && remove_all_fetch_refspecs(remotename, key.buf)) {
1337                 strbuf_release(&key);
1338                 return 1;
1339         }
1340         if (add_branches(remote, branches, key.buf)) {
1341                 strbuf_release(&key);
1342                 return 1;
1343         }
1344
1345         strbuf_release(&key);
1346         return 0;
1347 }
1348
1349 static int set_branches(int argc, const char **argv)
1350 {
1351         int add_mode = 0;
1352         struct option options[] = {
1353                 OPT_BOOLEAN('\0', "add", &add_mode, "add branch"),
1354                 OPT_END()
1355         };
1356
1357         argc = parse_options(argc, argv, NULL, options,
1358                              builtin_remote_setbranches_usage, 0);
1359         if (argc == 0) {
1360                 error("no remote specified");
1361                 usage_with_options(builtin_remote_seturl_usage, options);
1362         }
1363         argv[argc] = NULL;
1364
1365         return set_remote_branches(argv[0], argv + 1, add_mode);
1366 }
1367
1368 static int set_url(int argc, const char **argv)
1369 {
1370         int i, push_mode = 0, add_mode = 0, delete_mode = 0;
1371         int matches = 0, negative_matches = 0;
1372         const char *remotename = NULL;
1373         const char *newurl = NULL;
1374         const char *oldurl = NULL;
1375         struct remote *remote;
1376         regex_t old_regex;
1377         const char **urlset;
1378         int urlset_nr;
1379         struct strbuf name_buf = STRBUF_INIT;
1380         struct option options[] = {
1381                 OPT_BOOLEAN('\0', "push", &push_mode,
1382                             "manipulate push URLs"),
1383                 OPT_BOOLEAN('\0', "add", &add_mode,
1384                             "add URL"),
1385                 OPT_BOOLEAN('\0', "delete", &delete_mode,
1386                             "delete URLs"),
1387                 OPT_END()
1388         };
1389         argc = parse_options(argc, argv, NULL, options, builtin_remote_update_usage,
1390                              PARSE_OPT_KEEP_ARGV0);
1391
1392         if (add_mode && delete_mode)
1393                 die("--add --delete doesn't make sense");
1394
1395         if (argc < 3 || argc > 4 || ((add_mode || delete_mode) && argc != 3))
1396                 usage_with_options(builtin_remote_seturl_usage, options);
1397
1398         remotename = argv[1];
1399         newurl = argv[2];
1400         if (argc > 3)
1401                 oldurl = argv[3];
1402
1403         if (delete_mode)
1404                 oldurl = newurl;
1405
1406         if (!remote_is_configured(remotename))
1407                 die("No such remote '%s'", remotename);
1408         remote = remote_get(remotename);
1409
1410         if (push_mode) {
1411                 strbuf_addf(&name_buf, "remote.%s.pushurl", remotename);
1412                 urlset = remote->pushurl;
1413                 urlset_nr = remote->pushurl_nr;
1414         } else {
1415                 strbuf_addf(&name_buf, "remote.%s.url", remotename);
1416                 urlset = remote->url;
1417                 urlset_nr = remote->url_nr;
1418         }
1419
1420         /* Special cases that add new entry. */
1421         if ((!oldurl && !delete_mode) || add_mode) {
1422                 if (add_mode)
1423                         git_config_set_multivar(name_buf.buf, newurl,
1424                                 "^$", 0);
1425                 else
1426                         git_config_set(name_buf.buf, newurl);
1427                 strbuf_release(&name_buf);
1428                 return 0;
1429         }
1430
1431         /* Old URL specified. Demand that one matches. */
1432         if (regcomp(&old_regex, oldurl, REG_EXTENDED))
1433                 die("Invalid old URL pattern: %s", oldurl);
1434
1435         for (i = 0; i < urlset_nr; i++)
1436                 if (!regexec(&old_regex, urlset[i], 0, NULL, 0))
1437                         matches++;
1438                 else
1439                         negative_matches++;
1440         if (!delete_mode && !matches)
1441                 die("No such URL found: %s", oldurl);
1442         if (delete_mode && !negative_matches && !push_mode)
1443                 die("Will not delete all non-push URLs");
1444
1445         regfree(&old_regex);
1446
1447         if (!delete_mode)
1448                 git_config_set_multivar(name_buf.buf, newurl, oldurl, 0);
1449         else
1450                 git_config_set_multivar(name_buf.buf, NULL, oldurl, 1);
1451         return 0;
1452 }
1453
1454 static int get_one_entry(struct remote *remote, void *priv)
1455 {
1456         struct string_list *list = priv;
1457         struct strbuf url_buf = STRBUF_INIT;
1458         const char **url;
1459         int i, url_nr;
1460
1461         if (remote->url_nr > 0) {
1462                 strbuf_addf(&url_buf, "%s (fetch)", remote->url[0]);
1463                 string_list_append(list, remote->name)->util =
1464                                 strbuf_detach(&url_buf, NULL);
1465         } else
1466                 string_list_append(list, remote->name)->util = NULL;
1467         if (remote->pushurl_nr) {
1468                 url = remote->pushurl;
1469                 url_nr = remote->pushurl_nr;
1470         } else {
1471                 url = remote->url;
1472                 url_nr = remote->url_nr;
1473         }
1474         for (i = 0; i < url_nr; i++)
1475         {
1476                 strbuf_addf(&url_buf, "%s (push)", url[i]);
1477                 string_list_append(list, remote->name)->util =
1478                                 strbuf_detach(&url_buf, NULL);
1479         }
1480
1481         return 0;
1482 }
1483
1484 static int show_all(void)
1485 {
1486         struct string_list list = STRING_LIST_INIT_NODUP;
1487         int result;
1488
1489         list.strdup_strings = 1;
1490         result = for_each_remote(get_one_entry, &list);
1491
1492         if (!result) {
1493                 int i;
1494
1495                 sort_string_list(&list);
1496                 for (i = 0; i < list.nr; i++) {
1497                         struct string_list_item *item = list.items + i;
1498                         if (verbose)
1499                                 printf("%s\t%s\n", item->string,
1500                                         item->util ? (const char *)item->util : "");
1501                         else {
1502                                 if (i && !strcmp((item - 1)->string, item->string))
1503                                         continue;
1504                                 printf("%s\n", item->string);
1505                         }
1506                 }
1507         }
1508         string_list_clear(&list, 1);
1509         return result;
1510 }
1511
1512 int cmd_remote(int argc, const char **argv, const char *prefix)
1513 {
1514         struct option options[] = {
1515                 OPT__VERBOSE(&verbose, "be verbose; must be placed before a subcommand"),
1516                 OPT_END()
1517         };
1518         int result;
1519
1520         argc = parse_options(argc, argv, prefix, options, builtin_remote_usage,
1521                 PARSE_OPT_STOP_AT_NON_OPTION);
1522
1523         if (argc < 1)
1524                 result = show_all();
1525         else if (!strcmp(argv[0], "add"))
1526                 result = add(argc, argv);
1527         else if (!strcmp(argv[0], "rename"))
1528                 result = mv(argc, argv);
1529         else if (!strcmp(argv[0], "rm"))
1530                 result = rm(argc, argv);
1531         else if (!strcmp(argv[0], "set-head"))
1532                 result = set_head(argc, argv);
1533         else if (!strcmp(argv[0], "set-branches"))
1534                 result = set_branches(argc, argv);
1535         else if (!strcmp(argv[0], "set-url"))
1536                 result = set_url(argc, argv);
1537         else if (!strcmp(argv[0], "show"))
1538                 result = show(argc, argv);
1539         else if (!strcmp(argv[0], "prune"))
1540                 result = prune(argc, argv);
1541         else if (!strcmp(argv[0], "update"))
1542                 result = update(argc, argv);
1543         else {
1544                 error("Unknown subcommand: %s", argv[0]);
1545                 usage_with_options(builtin_remote_usage, options);
1546         }
1547
1548         return result ? 1 : 0;
1549 }