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