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