2 #include "parse-options.h"
5 #include "string-list.h"
7 #include "run-command.h"
9 #include "argv-array.h"
11 static const char * const builtin_remote_usage[] = {
12 N_("git remote [-v | --verbose]"),
13 N_("git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--mirror=<fetch|push>] <name> <url>"),
14 N_("git remote rename <old> <new>"),
15 N_("git remote remove <name>"),
16 N_("git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"),
17 N_("git remote [-v | --verbose] show [-n] <name>"),
18 N_("git remote prune [-n | --dry-run] <name>"),
19 N_("git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"),
20 N_("git remote set-branches [--add] <name> <branch>..."),
21 N_("git remote set-url [--push] <name> <newurl> [<oldurl>]"),
22 N_("git remote set-url --add <name> <newurl>"),
23 N_("git remote set-url --delete <name> <url>"),
27 static const char * const builtin_remote_add_usage[] = {
28 N_("git remote add [<options>] <name> <url>"),
32 static const char * const builtin_remote_rename_usage[] = {
33 N_("git remote rename <old> <new>"),
37 static const char * const builtin_remote_rm_usage[] = {
38 N_("git remote remove <name>"),
42 static const char * const builtin_remote_sethead_usage[] = {
43 N_("git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"),
47 static const char * const builtin_remote_setbranches_usage[] = {
48 N_("git remote set-branches <name> <branch>..."),
49 N_("git remote set-branches --add <name> <branch>..."),
53 static const char * const builtin_remote_show_usage[] = {
54 N_("git remote show [<options>] <name>"),
58 static const char * const builtin_remote_prune_usage[] = {
59 N_("git remote prune [<options>] <name>"),
63 static const char * const builtin_remote_update_usage[] = {
64 N_("git remote update [<options>] [<group> | <remote>]..."),
68 static const char * const builtin_remote_seturl_usage[] = {
69 N_("git remote set-url [--push] <name> <newurl> [<oldurl>]"),
70 N_("git remote set-url --add <name> <newurl>"),
71 N_("git remote set-url --delete <name> <url>"),
75 #define GET_REF_STATES (1<<0)
76 #define GET_HEAD_NAMES (1<<1)
77 #define GET_PUSH_REF_STATES (1<<2)
81 static int fetch_remote(const char *name)
83 const char *argv[] = { "fetch", name, NULL, NULL };
88 printf_ln(_("Updating %s"), name);
89 if (run_command_v_opt(argv, RUN_GIT_CMD))
90 return error(_("Could not fetch %s"), name);
100 #define MIRROR_NONE 0
101 #define MIRROR_FETCH 1
102 #define MIRROR_PUSH 2
103 #define MIRROR_BOTH (MIRROR_FETCH|MIRROR_PUSH)
105 static int add_branch(const char *key, const char *branchname,
106 const char *remotename, int mirror, struct strbuf *tmp)
109 strbuf_addch(tmp, '+');
111 strbuf_addf(tmp, "refs/%s:refs/%s",
112 branchname, branchname);
114 strbuf_addf(tmp, "refs/heads/%s:refs/remotes/%s/%s",
115 branchname, remotename, branchname);
116 return git_config_set_multivar(key, tmp->buf, "^$", 0);
119 static const char mirror_advice[] =
120 N_("--mirror is dangerous and deprecated; please\n"
121 "\t use --mirror=fetch or --mirror=push instead");
123 static int parse_mirror_opt(const struct option *opt, const char *arg, int not)
125 unsigned *mirror = opt->value;
127 *mirror = MIRROR_NONE;
129 warning("%s", _(mirror_advice));
130 *mirror = MIRROR_BOTH;
132 else if (!strcmp(arg, "fetch"))
133 *mirror = MIRROR_FETCH;
134 else if (!strcmp(arg, "push"))
135 *mirror = MIRROR_PUSH;
137 return error(_("unknown mirror argument: %s"), arg);
141 static int add(int argc, const char **argv)
143 int fetch = 0, fetch_tags = TAGS_DEFAULT;
144 unsigned mirror = MIRROR_NONE;
145 struct string_list track = STRING_LIST_INIT_NODUP;
146 const char *master = NULL;
147 struct remote *remote;
148 struct strbuf buf = STRBUF_INIT, buf2 = STRBUF_INIT;
149 const char *name, *url;
152 struct option options[] = {
153 OPT_BOOL('f', "fetch", &fetch, N_("fetch the remote branches")),
154 OPT_SET_INT(0, "tags", &fetch_tags,
155 N_("import all tags and associated objects when fetching"),
157 OPT_SET_INT(0, NULL, &fetch_tags,
158 N_("or do not fetch any tag at all (--no-tags)"), TAGS_UNSET),
159 OPT_STRING_LIST('t', "track", &track, N_("branch"),
160 N_("branch(es) to track")),
161 OPT_STRING('m', "master", &master, N_("branch"), N_("master branch")),
162 { OPTION_CALLBACK, 0, "mirror", &mirror, N_("push|fetch"),
163 N_("set up remote as a mirror to push to or fetch from"),
164 PARSE_OPT_OPTARG, parse_mirror_opt },
168 argc = parse_options(argc, argv, NULL, options, builtin_remote_add_usage,
172 usage_with_options(builtin_remote_add_usage, options);
174 if (mirror && master)
175 die(_("specifying a master branch makes no sense with --mirror"));
176 if (mirror && !(mirror & MIRROR_FETCH) && track.nr)
177 die(_("specifying branches to track makes sense only with fetch mirrors"));
182 remote = remote_get(name);
183 if (remote && (remote->url_nr > 1 || strcmp(name, remote->url[0]) ||
184 remote->fetch_refspec_nr))
185 die(_("remote %s already exists."), name);
187 strbuf_addf(&buf2, "refs/heads/test:refs/remotes/%s/test", name);
188 if (!valid_fetch_refspec(buf2.buf))
189 die(_("'%s' is not a valid remote name"), name);
191 strbuf_addf(&buf, "remote.%s.url", name);
192 if (git_config_set(buf.buf, url))
195 if (!mirror || mirror & MIRROR_FETCH) {
197 strbuf_addf(&buf, "remote.%s.fetch", name);
199 string_list_append(&track, "*");
200 for (i = 0; i < track.nr; i++) {
201 if (add_branch(buf.buf, track.items[i].string,
202 name, mirror, &buf2))
207 if (mirror & MIRROR_PUSH) {
209 strbuf_addf(&buf, "remote.%s.mirror", name);
210 if (git_config_set(buf.buf, "true"))
214 if (fetch_tags != TAGS_DEFAULT) {
216 strbuf_addf(&buf, "remote.%s.tagopt", name);
217 if (git_config_set(buf.buf,
218 fetch_tags == TAGS_SET ? "--tags" : "--no-tags"))
222 if (fetch && fetch_remote(name))
227 strbuf_addf(&buf, "refs/remotes/%s/HEAD", name);
230 strbuf_addf(&buf2, "refs/remotes/%s/%s", name, master);
232 if (create_symref(buf.buf, buf2.buf, "remote add"))
233 return error(_("Could not setup master '%s'"), master);
236 strbuf_release(&buf);
237 strbuf_release(&buf2);
238 string_list_clear(&track, 0);
245 struct string_list merge;
249 static struct string_list branch_list;
251 static const char *abbrev_ref(const char *name, const char *prefix)
253 const char *abbrev = skip_prefix(name, prefix);
258 #define abbrev_branch(name) abbrev_ref((name), "refs/heads/")
260 static int config_read_branches(const char *key, const char *value, void *cb)
262 if (starts_with(key, "branch.")) {
263 const char *orig_key = key;
265 struct string_list_item *item;
266 struct branch_info *info;
267 enum { REMOTE, MERGE, REBASE } type;
271 if (strip_suffix(key, ".remote", &key_len)) {
272 name = xmemdupz(key, key_len);
274 } else if (strip_suffix(key, ".merge", &key_len)) {
275 name = xmemdupz(key, key_len);
277 } else if (strip_suffix(key, ".rebase", &key_len)) {
278 name = xmemdupz(key, key_len);
283 item = string_list_insert(&branch_list, name);
286 item->util = xcalloc(sizeof(struct branch_info), 1);
288 if (type == REMOTE) {
289 if (info->remote_name)
290 warning(_("more than one %s"), orig_key);
291 info->remote_name = xstrdup(value);
292 } else if (type == MERGE) {
293 char *space = strchr(value, ' ');
294 value = abbrev_branch(value);
297 merge = xstrndup(value, space - value);
298 string_list_append(&info->merge, merge);
299 value = abbrev_branch(space + 1);
300 space = strchr(value, ' ');
302 string_list_append(&info->merge, xstrdup(value));
304 int v = git_config_maybe_bool(orig_key, value);
307 else if (!strcmp(value, "preserve"))
314 static void read_branches(void)
318 git_config(config_read_branches, NULL);
322 struct remote *remote;
323 struct string_list new, stale, tracked, heads, push;
327 static int get_ref_states(const struct ref *remote_refs, struct ref_states *states)
329 struct ref *fetch_map = NULL, **tail = &fetch_map;
330 struct ref *ref, *stale_refs;
333 for (i = 0; i < states->remote->fetch_refspec_nr; i++)
334 if (get_fetch_map(remote_refs, states->remote->fetch + i, &tail, 1))
335 die(_("Could not get fetch map for refspec %s"),
336 states->remote->fetch_refspec[i]);
338 states->new.strdup_strings = 1;
339 states->tracked.strdup_strings = 1;
340 states->stale.strdup_strings = 1;
341 for (ref = fetch_map; ref; ref = ref->next) {
342 if (!ref->peer_ref || !ref_exists(ref->peer_ref->name))
343 string_list_append(&states->new, abbrev_branch(ref->name));
345 string_list_append(&states->tracked, abbrev_branch(ref->name));
347 stale_refs = get_stale_heads(states->remote->fetch,
348 states->remote->fetch_refspec_nr, fetch_map);
349 for (ref = stale_refs; ref; ref = ref->next) {
350 struct string_list_item *item =
351 string_list_append(&states->stale, abbrev_branch(ref->name));
352 item->util = xstrdup(ref->name);
354 free_refs(stale_refs);
355 free_refs(fetch_map);
357 sort_string_list(&states->new);
358 sort_string_list(&states->tracked);
359 sort_string_list(&states->stale);
368 PUSH_STATUS_CREATE = 0,
370 PUSH_STATUS_UPTODATE,
371 PUSH_STATUS_FASTFORWARD,
372 PUSH_STATUS_OUTOFDATE,
373 PUSH_STATUS_NOTQUERIED
377 static int get_push_ref_states(const struct ref *remote_refs,
378 struct ref_states *states)
380 struct remote *remote = states->remote;
381 struct ref *ref, *local_refs, *push_map;
385 local_refs = get_local_heads();
386 push_map = copy_ref_list(remote_refs);
388 match_push_refs(local_refs, &push_map, remote->push_refspec_nr,
389 remote->push_refspec, MATCH_REFS_NONE);
391 states->push.strdup_strings = 1;
392 for (ref = push_map; ref; ref = ref->next) {
393 struct string_list_item *item;
394 struct push_info *info;
398 hashcpy(ref->new_sha1, ref->peer_ref->new_sha1);
400 item = string_list_append(&states->push,
401 abbrev_branch(ref->peer_ref->name));
402 item->util = xcalloc(sizeof(struct push_info), 1);
404 info->forced = ref->force;
405 info->dest = xstrdup(abbrev_branch(ref->name));
407 if (is_null_sha1(ref->new_sha1)) {
408 info->status = PUSH_STATUS_DELETE;
409 } else if (!hashcmp(ref->old_sha1, ref->new_sha1))
410 info->status = PUSH_STATUS_UPTODATE;
411 else if (is_null_sha1(ref->old_sha1))
412 info->status = PUSH_STATUS_CREATE;
413 else if (has_sha1_file(ref->old_sha1) &&
414 ref_newer(ref->new_sha1, ref->old_sha1))
415 info->status = PUSH_STATUS_FASTFORWARD;
417 info->status = PUSH_STATUS_OUTOFDATE;
419 free_refs(local_refs);
424 static int get_push_ref_states_noquery(struct ref_states *states)
427 struct remote *remote = states->remote;
428 struct string_list_item *item;
429 struct push_info *info;
434 states->push.strdup_strings = 1;
435 if (!remote->push_refspec_nr) {
436 item = string_list_append(&states->push, _("(matching)"));
437 info = item->util = xcalloc(sizeof(struct push_info), 1);
438 info->status = PUSH_STATUS_NOTQUERIED;
439 info->dest = xstrdup(item->string);
441 for (i = 0; i < remote->push_refspec_nr; i++) {
442 struct refspec *spec = remote->push + i;
444 item = string_list_append(&states->push, _("(matching)"));
445 else if (strlen(spec->src))
446 item = string_list_append(&states->push, spec->src);
448 item = string_list_append(&states->push, _("(delete)"));
450 info = item->util = xcalloc(sizeof(struct push_info), 1);
451 info->forced = spec->force;
452 info->status = PUSH_STATUS_NOTQUERIED;
453 info->dest = xstrdup(spec->dst ? spec->dst : item->string);
458 static int get_head_names(const struct ref *remote_refs, struct ref_states *states)
460 struct ref *ref, *matches;
461 struct ref *fetch_map = NULL, **fetch_map_tail = &fetch_map;
462 struct refspec refspec;
466 refspec.src = refspec.dst = "refs/heads/*";
467 states->heads.strdup_strings = 1;
468 get_fetch_map(remote_refs, &refspec, &fetch_map_tail, 0);
469 matches = guess_remote_head(find_ref_by_name(remote_refs, "HEAD"),
471 for (ref = matches; ref; ref = ref->next)
472 string_list_append(&states->heads, abbrev_branch(ref->name));
474 free_refs(fetch_map);
480 struct known_remote {
481 struct known_remote *next;
482 struct remote *remote;
485 struct known_remotes {
486 struct remote *to_delete;
487 struct known_remote *list;
490 static int add_known_remote(struct remote *remote, void *cb_data)
492 struct known_remotes *all = cb_data;
493 struct known_remote *r;
495 if (!strcmp(all->to_delete->name, remote->name))
498 r = xmalloc(sizeof(*r));
505 struct branches_for_remote {
506 struct remote *remote;
507 struct string_list *branches, *skipped;
508 struct known_remotes *keep;
511 static int add_branch_for_removal(const char *refname,
512 const unsigned char *sha1, int flags, void *cb_data)
514 struct branches_for_remote *branches = cb_data;
515 struct refspec refspec;
516 struct string_list_item *item;
517 struct known_remote *kr;
519 memset(&refspec, 0, sizeof(refspec));
520 refspec.dst = (char *)refname;
521 if (remote_find_tracking(branches->remote, &refspec))
524 /* don't delete a branch if another remote also uses it */
525 for (kr = branches->keep->list; kr; kr = kr->next) {
526 memset(&refspec, 0, sizeof(refspec));
527 refspec.dst = (char *)refname;
528 if (!remote_find_tracking(kr->remote, &refspec))
532 /* don't delete non-remote-tracking refs */
533 if (!starts_with(refname, "refs/remotes/")) {
534 /* advise user how to delete local branches */
535 if (starts_with(refname, "refs/heads/"))
536 string_list_append(branches->skipped,
537 abbrev_branch(refname));
538 /* silently skip over other non-remote refs */
542 /* make sure that symrefs are deleted */
543 if (flags & REF_ISSYMREF)
544 return unlink(git_path("%s", refname));
546 item = string_list_append(branches->branches, refname);
547 item->util = xmalloc(20);
548 hashcpy(item->util, sha1);
556 struct string_list *remote_branches;
559 static int read_remote_branches(const char *refname,
560 const unsigned char *sha1, int flags, void *cb_data)
562 struct rename_info *rename = cb_data;
563 struct strbuf buf = STRBUF_INIT;
564 struct string_list_item *item;
566 unsigned char orig_sha1[20];
569 strbuf_addf(&buf, "refs/remotes/%s/", rename->old);
570 if (starts_with(refname, buf.buf)) {
571 item = string_list_append(rename->remote_branches, xstrdup(refname));
572 symref = resolve_ref_unsafe(refname, orig_sha1, 1, &flag);
573 if (flag & REF_ISSYMREF)
574 item->util = xstrdup(symref);
582 static int migrate_file(struct remote *remote)
584 struct strbuf buf = STRBUF_INIT;
588 strbuf_addf(&buf, "remote.%s.url", remote->name);
589 for (i = 0; i < remote->url_nr; i++)
590 if (git_config_set_multivar(buf.buf, remote->url[i], "^$", 0))
591 return error(_("Could not append '%s' to '%s'"),
592 remote->url[i], buf.buf);
594 strbuf_addf(&buf, "remote.%s.push", remote->name);
595 for (i = 0; i < remote->push_refspec_nr; i++)
596 if (git_config_set_multivar(buf.buf, remote->push_refspec[i], "^$", 0))
597 return error(_("Could not append '%s' to '%s'"),
598 remote->push_refspec[i], buf.buf);
600 strbuf_addf(&buf, "remote.%s.fetch", remote->name);
601 for (i = 0; i < remote->fetch_refspec_nr; i++)
602 if (git_config_set_multivar(buf.buf, remote->fetch_refspec[i], "^$", 0))
603 return error(_("Could not append '%s' to '%s'"),
604 remote->fetch_refspec[i], buf.buf);
605 if (remote->origin == REMOTE_REMOTES)
606 path = git_path("remotes/%s", remote->name);
607 else if (remote->origin == REMOTE_BRANCHES)
608 path = git_path("branches/%s", remote->name);
610 unlink_or_warn(path);
614 static int mv(int argc, const char **argv)
616 struct option options[] = {
619 struct remote *oldremote, *newremote;
620 struct strbuf buf = STRBUF_INIT, buf2 = STRBUF_INIT, buf3 = STRBUF_INIT,
621 old_remote_context = STRBUF_INIT;
622 struct string_list remote_branches = STRING_LIST_INIT_NODUP;
623 struct rename_info rename;
624 int i, refspec_updated = 0;
627 usage_with_options(builtin_remote_rename_usage, options);
629 rename.old = argv[1];
630 rename.new = argv[2];
631 rename.remote_branches = &remote_branches;
633 oldremote = remote_get(rename.old);
635 die(_("No such remote: %s"), rename.old);
637 if (!strcmp(rename.old, rename.new) && oldremote->origin != REMOTE_CONFIG)
638 return migrate_file(oldremote);
640 newremote = remote_get(rename.new);
641 if (newremote && (newremote->url_nr > 1 || newremote->fetch_refspec_nr))
642 die(_("remote %s already exists."), rename.new);
644 strbuf_addf(&buf, "refs/heads/test:refs/remotes/%s/test", rename.new);
645 if (!valid_fetch_refspec(buf.buf))
646 die(_("'%s' is not a valid remote name"), rename.new);
649 strbuf_addf(&buf, "remote.%s", rename.old);
650 strbuf_addf(&buf2, "remote.%s", rename.new);
651 if (git_config_rename_section(buf.buf, buf2.buf) < 1)
652 return error(_("Could not rename config section '%s' to '%s'"),
656 strbuf_addf(&buf, "remote.%s.fetch", rename.new);
657 if (git_config_set_multivar(buf.buf, NULL, NULL, 1))
658 return error(_("Could not remove config section '%s'"), buf.buf);
659 strbuf_addf(&old_remote_context, ":refs/remotes/%s/", rename.old);
660 for (i = 0; i < oldremote->fetch_refspec_nr; i++) {
664 strbuf_addstr(&buf2, oldremote->fetch_refspec[i]);
665 ptr = strstr(buf2.buf, old_remote_context.buf);
669 ptr-buf2.buf + strlen(":refs/remotes/"),
670 strlen(rename.old), rename.new,
673 warning(_("Not updating non-default fetch refspec\n"
675 "\tPlease update the configuration manually if necessary."),
678 if (git_config_set_multivar(buf.buf, buf2.buf, "^$", 0))
679 return error(_("Could not append '%s'"), buf.buf);
683 for (i = 0; i < branch_list.nr; i++) {
684 struct string_list_item *item = branch_list.items + i;
685 struct branch_info *info = item->util;
686 if (info->remote_name && !strcmp(info->remote_name, rename.old)) {
688 strbuf_addf(&buf, "branch.%s.remote", item->string);
689 if (git_config_set(buf.buf, rename.new)) {
690 return error(_("Could not set '%s'"), buf.buf);
695 if (!refspec_updated)
699 * First remove symrefs, then rename the rest, finally create
702 for_each_ref(read_remote_branches, &rename);
703 for (i = 0; i < remote_branches.nr; i++) {
704 struct string_list_item *item = remote_branches.items + i;
706 unsigned char sha1[20];
708 read_ref_full(item->string, sha1, 1, &flag);
709 if (!(flag & REF_ISSYMREF))
711 if (delete_ref(item->string, NULL, REF_NODEREF))
712 die(_("deleting '%s' failed"), item->string);
714 for (i = 0; i < remote_branches.nr; i++) {
715 struct string_list_item *item = remote_branches.items + i;
720 strbuf_addstr(&buf, item->string);
721 strbuf_splice(&buf, strlen("refs/remotes/"), strlen(rename.old),
722 rename.new, strlen(rename.new));
724 strbuf_addf(&buf2, "remote: renamed %s to %s",
725 item->string, buf.buf);
726 if (rename_ref(item->string, buf.buf, buf2.buf))
727 die(_("renaming '%s' failed"), item->string);
729 for (i = 0; i < remote_branches.nr; i++) {
730 struct string_list_item *item = remote_branches.items + i;
735 strbuf_addstr(&buf, item->string);
736 strbuf_splice(&buf, strlen("refs/remotes/"), strlen(rename.old),
737 rename.new, strlen(rename.new));
739 strbuf_addstr(&buf2, item->util);
740 strbuf_splice(&buf2, strlen("refs/remotes/"), strlen(rename.old),
741 rename.new, strlen(rename.new));
743 strbuf_addf(&buf3, "remote: renamed %s to %s",
744 item->string, buf.buf);
745 if (create_symref(buf.buf, buf2.buf, buf3.buf))
746 die(_("creating '%s' failed"), buf.buf);
751 static int remove_branches(struct string_list *branches)
753 const char **branch_names;
756 branch_names = xmalloc(branches->nr * sizeof(*branch_names));
757 for (i = 0; i < branches->nr; i++)
758 branch_names[i] = branches->items[i].string;
759 result |= repack_without_refs(branch_names, branches->nr);
762 for (i = 0; i < branches->nr; i++) {
763 struct string_list_item *item = branches->items + i;
764 const char *refname = item->string;
766 if (delete_ref(refname, NULL, 0))
767 result |= error(_("Could not remove branch %s"), refname);
773 static int rm(int argc, const char **argv)
775 struct option options[] = {
778 struct remote *remote;
779 struct strbuf buf = STRBUF_INIT;
780 struct known_remotes known_remotes = { NULL, NULL };
781 struct string_list branches = STRING_LIST_INIT_DUP;
782 struct string_list skipped = STRING_LIST_INIT_DUP;
783 struct branches_for_remote cb_data;
786 memset(&cb_data, 0, sizeof(cb_data));
787 cb_data.branches = &branches;
788 cb_data.skipped = &skipped;
789 cb_data.keep = &known_remotes;
792 usage_with_options(builtin_remote_rm_usage, options);
794 remote = remote_get(argv[1]);
796 die(_("No such remote: %s"), argv[1]);
798 known_remotes.to_delete = remote;
799 for_each_remote(add_known_remote, &known_remotes);
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++) {
809 strbuf_addf(&buf, "branch.%s.%s",
811 if (git_config_set(buf.buf, NULL)) {
812 strbuf_release(&buf);
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.
824 cb_data.remote = remote;
825 result = for_each_ref(add_branch_for_removal, &cb_data);
826 strbuf_release(&buf);
829 result = remove_branches(&branches);
830 string_list_clear(&branches, 1);
834 Q_("Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
835 "to delete it, use:",
836 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
837 "to delete them, use:",
839 for (i = 0; i < skipped.nr; i++)
840 fprintf(stderr, " git branch -d %s\n",
841 skipped.items[i].string);
843 string_list_clear(&skipped, 0);
846 strbuf_addf(&buf, "remote.%s", remote->name);
847 if (git_config_rename_section(buf.buf, NULL) < 1)
848 return error(_("Could not remove config section '%s'"), buf.buf);
854 static void clear_push_info(void *util, const char *string)
856 struct push_info *info = util;
861 static void free_remote_ref_states(struct ref_states *states)
863 string_list_clear(&states->new, 0);
864 string_list_clear(&states->stale, 1);
865 string_list_clear(&states->tracked, 0);
866 string_list_clear(&states->heads, 0);
867 string_list_clear_func(&states->push, clear_push_info);
870 static int append_ref_to_tracked_list(const char *refname,
871 const unsigned char *sha1, int flags, void *cb_data)
873 struct ref_states *states = cb_data;
874 struct refspec refspec;
876 if (flags & REF_ISSYMREF)
879 memset(&refspec, 0, sizeof(refspec));
880 refspec.dst = (char *)refname;
881 if (!remote_find_tracking(states->remote, &refspec))
882 string_list_append(&states->tracked, abbrev_branch(refspec.src));
887 static int get_remote_ref_states(const char *name,
888 struct ref_states *states,
891 struct transport *transport;
892 const struct ref *remote_refs;
894 states->remote = remote_get(name);
896 return error(_("No such remote: %s"), name);
901 transport = transport_get(states->remote, states->remote->url_nr > 0 ?
902 states->remote->url[0] : NULL);
903 remote_refs = transport_get_remote_refs(transport);
904 transport_disconnect(transport);
907 if (query & GET_REF_STATES)
908 get_ref_states(remote_refs, states);
909 if (query & GET_HEAD_NAMES)
910 get_head_names(remote_refs, states);
911 if (query & GET_PUSH_REF_STATES)
912 get_push_ref_states(remote_refs, states);
914 for_each_ref(append_ref_to_tracked_list, states);
915 sort_string_list(&states->tracked);
916 get_push_ref_states_noquery(states);
923 struct string_list *list;
924 struct ref_states *states;
929 static int add_remote_to_show_info(struct string_list_item *item, void *cb_data)
931 struct show_info *info = cb_data;
932 int n = strlen(item->string);
935 string_list_insert(info->list, item->string);
939 static int show_remote_info_item(struct string_list_item *item, void *cb_data)
941 struct show_info *info = cb_data;
942 struct ref_states *states = info->states;
943 const char *name = item->string;
945 if (states->queried) {
946 const char *fmt = "%s";
947 const char *arg = "";
948 if (string_list_has_string(&states->new, name)) {
949 fmt = _(" new (next fetch will store in remotes/%s)");
950 arg = states->remote->name;
951 } else if (string_list_has_string(&states->tracked, name))
953 else if (string_list_has_string(&states->stale, name))
954 arg = _(" stale (use 'git remote prune' to remove)");
957 printf(" %-*s", info->width, name);
961 printf(" %s\n", name);
966 static int add_local_to_show_info(struct string_list_item *branch_item, void *cb_data)
968 struct show_info *show_info = cb_data;
969 struct ref_states *states = show_info->states;
970 struct branch_info *branch_info = branch_item->util;
971 struct string_list_item *item;
974 if (!branch_info->merge.nr || !branch_info->remote_name ||
975 strcmp(states->remote->name, branch_info->remote_name))
977 if ((n = strlen(branch_item->string)) > show_info->width)
978 show_info->width = n;
979 if (branch_info->rebase)
980 show_info->any_rebase = 1;
982 item = string_list_insert(show_info->list, branch_item->string);
983 item->util = branch_info;
988 static int show_local_info_item(struct string_list_item *item, void *cb_data)
990 struct show_info *show_info = cb_data;
991 struct branch_info *branch_info = item->util;
992 struct string_list *merge = &branch_info->merge;
996 if (branch_info->rebase && branch_info->merge.nr > 1) {
997 error(_("invalid branch.%s.merge; cannot rebase onto > 1 branch"),
1002 printf(" %-*s ", show_info->width, item->string);
1003 if (branch_info->rebase) {
1004 printf_ln(_("rebases onto remote %s"), merge->items[0].string);
1006 } else if (show_info->any_rebase) {
1007 printf_ln(_(" merges with remote %s"), merge->items[0].string);
1008 also = _(" and with remote");
1010 printf_ln(_("merges with remote %s"), merge->items[0].string);
1011 also = _(" and with remote");
1013 for (i = 1; i < merge->nr; i++)
1014 printf(" %-*s %s %s\n", show_info->width, "", also,
1015 merge->items[i].string);
1020 static int add_push_to_show_info(struct string_list_item *push_item, void *cb_data)
1022 struct show_info *show_info = cb_data;
1023 struct push_info *push_info = push_item->util;
1024 struct string_list_item *item;
1026 if ((n = strlen(push_item->string)) > show_info->width)
1027 show_info->width = n;
1028 if ((n = strlen(push_info->dest)) > show_info->width2)
1029 show_info->width2 = n;
1030 item = string_list_append(show_info->list, push_item->string);
1031 item->util = push_item->util;
1036 * Sorting comparison for a string list that has push_info
1037 * structs in its util field
1039 static int cmp_string_with_push(const void *va, const void *vb)
1041 const struct string_list_item *a = va;
1042 const struct string_list_item *b = vb;
1043 const struct push_info *a_push = a->util;
1044 const struct push_info *b_push = b->util;
1045 int cmp = strcmp(a->string, b->string);
1046 return cmp ? cmp : strcmp(a_push->dest, b_push->dest);
1049 static int show_push_info_item(struct string_list_item *item, void *cb_data)
1051 struct show_info *show_info = cb_data;
1052 struct push_info *push_info = item->util;
1053 const char *src = item->string, *status = NULL;
1055 switch (push_info->status) {
1056 case PUSH_STATUS_CREATE:
1057 status = _("create");
1059 case PUSH_STATUS_DELETE:
1060 status = _("delete");
1063 case PUSH_STATUS_UPTODATE:
1064 status = _("up to date");
1066 case PUSH_STATUS_FASTFORWARD:
1067 status = _("fast-forwardable");
1069 case PUSH_STATUS_OUTOFDATE:
1070 status = _("local out of date");
1072 case PUSH_STATUS_NOTQUERIED:
1076 if (push_info->forced)
1077 printf_ln(_(" %-*s forces to %-*s (%s)"), show_info->width, src,
1078 show_info->width2, push_info->dest, status);
1080 printf_ln(_(" %-*s pushes to %-*s (%s)"), show_info->width, src,
1081 show_info->width2, push_info->dest, status);
1083 if (push_info->forced)
1084 printf_ln(_(" %-*s forces to %s"), show_info->width, src,
1087 printf_ln(_(" %-*s pushes to %s"), show_info->width, src,
1093 static int get_one_entry(struct remote *remote, void *priv)
1095 struct string_list *list = priv;
1096 struct strbuf url_buf = STRBUF_INIT;
1100 if (remote->url_nr > 0) {
1101 strbuf_addf(&url_buf, "%s (fetch)", remote->url[0]);
1102 string_list_append(list, remote->name)->util =
1103 strbuf_detach(&url_buf, NULL);
1105 string_list_append(list, remote->name)->util = NULL;
1106 if (remote->pushurl_nr) {
1107 url = remote->pushurl;
1108 url_nr = remote->pushurl_nr;
1111 url_nr = remote->url_nr;
1113 for (i = 0; i < url_nr; i++)
1115 strbuf_addf(&url_buf, "%s (push)", url[i]);
1116 string_list_append(list, remote->name)->util =
1117 strbuf_detach(&url_buf, NULL);
1123 static int show_all(void)
1125 struct string_list list = STRING_LIST_INIT_NODUP;
1128 list.strdup_strings = 1;
1129 result = for_each_remote(get_one_entry, &list);
1134 sort_string_list(&list);
1135 for (i = 0; i < list.nr; i++) {
1136 struct string_list_item *item = list.items + i;
1138 printf("%s\t%s\n", item->string,
1139 item->util ? (const char *)item->util : "");
1141 if (i && !strcmp((item - 1)->string, item->string))
1143 printf("%s\n", item->string);
1147 string_list_clear(&list, 1);
1151 static int show(int argc, const char **argv)
1153 int no_query = 0, result = 0, query_flag = 0;
1154 struct option options[] = {
1155 OPT_BOOL('n', NULL, &no_query, N_("do not query remotes")),
1158 struct ref_states states;
1159 struct string_list info_list = STRING_LIST_INIT_NODUP;
1160 struct show_info info;
1162 argc = parse_options(argc, argv, NULL, options, builtin_remote_show_usage,
1169 query_flag = (GET_REF_STATES | GET_HEAD_NAMES | GET_PUSH_REF_STATES);
1171 memset(&states, 0, sizeof(states));
1172 memset(&info, 0, sizeof(info));
1173 info.states = &states;
1174 info.list = &info_list;
1175 for (; argc; argc--, argv++) {
1180 get_remote_ref_states(*argv, &states, query_flag);
1182 printf_ln(_("* remote %s"), *argv);
1183 printf_ln(_(" Fetch URL: %s"), states.remote->url_nr > 0 ?
1184 states.remote->url[0] : _("(no URL)"));
1185 if (states.remote->pushurl_nr) {
1186 url = states.remote->pushurl;
1187 url_nr = states.remote->pushurl_nr;
1189 url = states.remote->url;
1190 url_nr = states.remote->url_nr;
1192 for (i = 0; i < url_nr; i++)
1193 printf_ln(_(" Push URL: %s"), url[i]);
1195 printf_ln(_(" Push URL: %s"), "(no URL)");
1197 printf_ln(_(" HEAD branch: %s"), "(not queried)");
1198 else if (!states.heads.nr)
1199 printf_ln(_(" HEAD branch: %s"), "(unknown)");
1200 else if (states.heads.nr == 1)
1201 printf_ln(_(" HEAD branch: %s"), states.heads.items[0].string);
1203 printf(_(" HEAD branch (remote HEAD is ambiguous,"
1204 " may be one of the following):\n"));
1205 for (i = 0; i < states.heads.nr; i++)
1206 printf(" %s\n", states.heads.items[i].string);
1209 /* remote branch info */
1211 for_each_string_list(&states.new, add_remote_to_show_info, &info);
1212 for_each_string_list(&states.tracked, add_remote_to_show_info, &info);
1213 for_each_string_list(&states.stale, add_remote_to_show_info, &info);
1215 printf_ln(Q_(" Remote branch:%s",
1216 " Remote branches:%s",
1218 no_query ? _(" (status not queried)") : "");
1219 for_each_string_list(info.list, show_remote_info_item, &info);
1220 string_list_clear(info.list, 0);
1224 info.any_rebase = 0;
1225 for_each_string_list(&branch_list, add_local_to_show_info, &info);
1227 printf_ln(Q_(" Local branch configured for 'git pull':",
1228 " Local branches configured for 'git pull':",
1230 for_each_string_list(info.list, show_local_info_item, &info);
1231 string_list_clear(info.list, 0);
1234 if (states.remote->mirror)
1235 printf_ln(_(" Local refs will be mirrored by 'git push'"));
1237 info.width = info.width2 = 0;
1238 for_each_string_list(&states.push, add_push_to_show_info, &info);
1239 qsort(info.list->items, info.list->nr,
1240 sizeof(*info.list->items), cmp_string_with_push);
1242 printf_ln(Q_(" Local ref configured for 'git push'%s:",
1243 " Local refs configured for 'git push'%s:",
1245 no_query ? _(" (status not queried)") : "");
1246 for_each_string_list(info.list, show_push_info_item, &info);
1247 string_list_clear(info.list, 0);
1249 free_remote_ref_states(&states);
1255 static int set_head(int argc, const char **argv)
1257 int i, opt_a = 0, opt_d = 0, result = 0;
1258 struct strbuf buf = STRBUF_INIT, buf2 = STRBUF_INIT;
1259 char *head_name = NULL;
1261 struct option options[] = {
1262 OPT_BOOL('a', "auto", &opt_a,
1263 N_("set refs/remotes/<name>/HEAD according to remote")),
1264 OPT_BOOL('d', "delete", &opt_d,
1265 N_("delete refs/remotes/<name>/HEAD")),
1268 argc = parse_options(argc, argv, NULL, options, builtin_remote_sethead_usage,
1271 strbuf_addf(&buf, "refs/remotes/%s/HEAD", argv[0]);
1273 if (!opt_a && !opt_d && argc == 2) {
1274 head_name = xstrdup(argv[1]);
1275 } else if (opt_a && !opt_d && argc == 1) {
1276 struct ref_states states;
1277 memset(&states, 0, sizeof(states));
1278 get_remote_ref_states(argv[0], &states, GET_HEAD_NAMES);
1279 if (!states.heads.nr)
1280 result |= error(_("Cannot determine remote HEAD"));
1281 else if (states.heads.nr > 1) {
1282 result |= error(_("Multiple remote HEAD branches. "
1283 "Please choose one explicitly with:"));
1284 for (i = 0; i < states.heads.nr; i++)
1285 fprintf(stderr, " git remote set-head %s %s\n",
1286 argv[0], states.heads.items[i].string);
1288 head_name = xstrdup(states.heads.items[0].string);
1289 free_remote_ref_states(&states);
1290 } else if (opt_d && !opt_a && argc == 1) {
1291 if (delete_ref(buf.buf, NULL, REF_NODEREF))
1292 result |= error(_("Could not delete %s"), buf.buf);
1294 usage_with_options(builtin_remote_sethead_usage, options);
1297 strbuf_addf(&buf2, "refs/remotes/%s/%s", argv[0], head_name);
1298 /* make sure it's valid */
1299 if (!ref_exists(buf2.buf))
1300 result |= error(_("Not a valid ref: %s"), buf2.buf);
1301 else if (create_symref(buf.buf, buf2.buf, "remote set-head"))
1302 result |= error(_("Could not setup %s"), buf.buf);
1304 printf("%s/HEAD set to %s\n", argv[0], head_name);
1308 strbuf_release(&buf);
1309 strbuf_release(&buf2);
1313 static int prune_remote(const char *remote, int dry_run)
1316 struct ref_states states;
1317 struct string_list delete_refs_list = STRING_LIST_INIT_NODUP;
1318 const char **delete_refs;
1319 const char *dangling_msg = dry_run
1320 ? _(" %s will become dangling!")
1321 : _(" %s has become dangling!");
1323 memset(&states, 0, sizeof(states));
1324 get_remote_ref_states(remote, &states, GET_REF_STATES);
1326 if (states.stale.nr) {
1327 printf_ln(_("Pruning %s"), remote);
1328 printf_ln(_("URL: %s"),
1329 states.remote->url_nr
1330 ? states.remote->url[0]
1333 delete_refs = xmalloc(states.stale.nr * sizeof(*delete_refs));
1334 for (i = 0; i < states.stale.nr; i++)
1335 delete_refs[i] = states.stale.items[i].util;
1337 result |= repack_without_refs(delete_refs, states.stale.nr);
1341 for (i = 0; i < states.stale.nr; i++) {
1342 const char *refname = states.stale.items[i].util;
1344 string_list_insert(&delete_refs_list, refname);
1347 result |= delete_ref(refname, NULL, 0);
1350 printf_ln(_(" * [would prune] %s"),
1351 abbrev_ref(refname, "refs/remotes/"));
1353 printf_ln(_(" * [pruned] %s"),
1354 abbrev_ref(refname, "refs/remotes/"));
1357 warn_dangling_symrefs(stdout, dangling_msg, &delete_refs_list);
1358 string_list_clear(&delete_refs_list, 0);
1360 free_remote_ref_states(&states);
1364 static int prune(int argc, const char **argv)
1366 int dry_run = 0, result = 0;
1367 struct option options[] = {
1368 OPT__DRY_RUN(&dry_run, N_("dry run")),
1372 argc = parse_options(argc, argv, NULL, options, builtin_remote_prune_usage,
1376 usage_with_options(builtin_remote_prune_usage, options);
1378 for (; argc; argc--, argv++)
1379 result |= prune_remote(*argv, dry_run);
1384 static int get_remote_default(const char *key, const char *value, void *priv)
1386 if (strcmp(key, "remotes.default") == 0) {
1393 static int update(int argc, const char **argv)
1396 struct option options[] = {
1397 OPT_BOOL('p', "prune", &prune,
1398 N_("prune remotes after fetching")),
1401 struct argv_array fetch_argv = ARGV_ARRAY_INIT;
1402 int default_defined = 0;
1405 argc = parse_options(argc, argv, NULL, options, builtin_remote_update_usage,
1406 PARSE_OPT_KEEP_ARGV0);
1408 argv_array_push(&fetch_argv, "fetch");
1411 argv_array_push(&fetch_argv, prune ? "--prune" : "--no-prune");
1413 argv_array_push(&fetch_argv, "-v");
1414 argv_array_push(&fetch_argv, "--multiple");
1416 argv_array_push(&fetch_argv, "default");
1417 for (i = 1; i < argc; i++)
1418 argv_array_push(&fetch_argv, argv[i]);
1420 if (strcmp(fetch_argv.argv[fetch_argv.argc-1], "default") == 0) {
1421 git_config(get_remote_default, &default_defined);
1422 if (!default_defined) {
1423 argv_array_pop(&fetch_argv);
1424 argv_array_push(&fetch_argv, "--all");
1428 retval = run_command_v_opt(fetch_argv.argv, RUN_GIT_CMD);
1429 argv_array_clear(&fetch_argv);
1433 static int remove_all_fetch_refspecs(const char *remote, const char *key)
1435 return git_config_set_multivar(key, NULL, NULL, 1);
1438 static int add_branches(struct remote *remote, const char **branches,
1441 const char *remotename = remote->name;
1442 int mirror = remote->mirror;
1443 struct strbuf refspec = STRBUF_INIT;
1445 for (; *branches; branches++)
1446 if (add_branch(key, *branches, remotename, mirror, &refspec)) {
1447 strbuf_release(&refspec);
1451 strbuf_release(&refspec);
1455 static int set_remote_branches(const char *remotename, const char **branches,
1458 struct strbuf key = STRBUF_INIT;
1459 struct remote *remote;
1461 strbuf_addf(&key, "remote.%s.fetch", remotename);
1463 if (!remote_is_configured(remotename))
1464 die(_("No such remote '%s'"), remotename);
1465 remote = remote_get(remotename);
1467 if (!add_mode && remove_all_fetch_refspecs(remotename, key.buf)) {
1468 strbuf_release(&key);
1471 if (add_branches(remote, branches, key.buf)) {
1472 strbuf_release(&key);
1476 strbuf_release(&key);
1480 static int set_branches(int argc, const char **argv)
1483 struct option options[] = {
1484 OPT_BOOL('\0', "add", &add_mode, N_("add branch")),
1488 argc = parse_options(argc, argv, NULL, options,
1489 builtin_remote_setbranches_usage, 0);
1491 error(_("no remote specified"));
1492 usage_with_options(builtin_remote_setbranches_usage, options);
1496 return set_remote_branches(argv[0], argv + 1, add_mode);
1499 static int set_url(int argc, const char **argv)
1501 int i, push_mode = 0, add_mode = 0, delete_mode = 0;
1502 int matches = 0, negative_matches = 0;
1503 const char *remotename = NULL;
1504 const char *newurl = NULL;
1505 const char *oldurl = NULL;
1506 struct remote *remote;
1508 const char **urlset;
1510 struct strbuf name_buf = STRBUF_INIT;
1511 struct option options[] = {
1512 OPT_BOOL('\0', "push", &push_mode,
1513 N_("manipulate push URLs")),
1514 OPT_BOOL('\0', "add", &add_mode,
1516 OPT_BOOL('\0', "delete", &delete_mode,
1520 argc = parse_options(argc, argv, NULL, options, builtin_remote_seturl_usage,
1521 PARSE_OPT_KEEP_ARGV0);
1523 if (add_mode && delete_mode)
1524 die(_("--add --delete doesn't make sense"));
1526 if (argc < 3 || argc > 4 || ((add_mode || delete_mode) && argc != 3))
1527 usage_with_options(builtin_remote_seturl_usage, options);
1529 remotename = argv[1];
1537 if (!remote_is_configured(remotename))
1538 die(_("No such remote '%s'"), remotename);
1539 remote = remote_get(remotename);
1542 strbuf_addf(&name_buf, "remote.%s.pushurl", remotename);
1543 urlset = remote->pushurl;
1544 urlset_nr = remote->pushurl_nr;
1546 strbuf_addf(&name_buf, "remote.%s.url", remotename);
1547 urlset = remote->url;
1548 urlset_nr = remote->url_nr;
1551 /* Special cases that add new entry. */
1552 if ((!oldurl && !delete_mode) || add_mode) {
1554 git_config_set_multivar(name_buf.buf, newurl,
1557 git_config_set(name_buf.buf, newurl);
1558 strbuf_release(&name_buf);
1562 /* Old URL specified. Demand that one matches. */
1563 if (regcomp(&old_regex, oldurl, REG_EXTENDED))
1564 die(_("Invalid old URL pattern: %s"), oldurl);
1566 for (i = 0; i < urlset_nr; i++)
1567 if (!regexec(&old_regex, urlset[i], 0, NULL, 0))
1571 if (!delete_mode && !matches)
1572 die(_("No such URL found: %s"), oldurl);
1573 if (delete_mode && !negative_matches && !push_mode)
1574 die(_("Will not delete all non-push URLs"));
1576 regfree(&old_regex);
1579 git_config_set_multivar(name_buf.buf, newurl, oldurl, 0);
1581 git_config_set_multivar(name_buf.buf, NULL, oldurl, 1);
1585 int cmd_remote(int argc, const char **argv, const char *prefix)
1587 struct option options[] = {
1588 OPT__VERBOSE(&verbose, N_("be verbose; must be placed before a subcommand")),
1593 argc = parse_options(argc, argv, prefix, options, builtin_remote_usage,
1594 PARSE_OPT_STOP_AT_NON_OPTION);
1597 result = show_all();
1598 else if (!strcmp(argv[0], "add"))
1599 result = add(argc, argv);
1600 else if (!strcmp(argv[0], "rename"))
1601 result = mv(argc, argv);
1602 else if (!strcmp(argv[0], "rm") || !strcmp(argv[0], "remove"))
1603 result = rm(argc, argv);
1604 else if (!strcmp(argv[0], "set-head"))
1605 result = set_head(argc, argv);
1606 else if (!strcmp(argv[0], "set-branches"))
1607 result = set_branches(argc, argv);
1608 else if (!strcmp(argv[0], "set-url"))
1609 result = set_url(argc, argv);
1610 else if (!strcmp(argv[0], "show"))
1611 result = show(argc, argv);
1612 else if (!strcmp(argv[0], "prune"))
1613 result = prune(argc, argv);
1614 else if (!strcmp(argv[0], "update"))
1615 result = update(argc, argv);
1617 error(_("Unknown subcommand: %s"), argv[0]);
1618 usage_with_options(builtin_remote_usage, options);
1621 return result ? 1 : 0;