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 inline int postfixcmp(const char *string, const char *postfix)
83 int len1 = strlen(string), len2 = strlen(postfix);
86 return strcmp(string + len1 - len2, postfix);
89 static int fetch_remote(const char *name)
91 const char *argv[] = { "fetch", name, NULL, NULL };
96 printf_ln(_("Updating %s"), name);
97 if (run_command_v_opt(argv, RUN_GIT_CMD))
98 return error(_("Could not fetch %s"), name);
108 #define MIRROR_NONE 0
109 #define MIRROR_FETCH 1
110 #define MIRROR_PUSH 2
111 #define MIRROR_BOTH (MIRROR_FETCH|MIRROR_PUSH)
113 static int add_branch(const char *key, const char *branchname,
114 const char *remotename, int mirror, struct strbuf *tmp)
117 strbuf_addch(tmp, '+');
119 strbuf_addf(tmp, "refs/%s:refs/%s",
120 branchname, branchname);
122 strbuf_addf(tmp, "refs/heads/%s:refs/remotes/%s/%s",
123 branchname, remotename, branchname);
124 return git_config_set_multivar(key, tmp->buf, "^$", 0);
127 static const char mirror_advice[] =
128 N_("--mirror is dangerous and deprecated; please\n"
129 "\t use --mirror=fetch or --mirror=push instead");
131 static int parse_mirror_opt(const struct option *opt, const char *arg, int not)
133 unsigned *mirror = opt->value;
135 *mirror = MIRROR_NONE;
137 warning("%s", _(mirror_advice));
138 *mirror = MIRROR_BOTH;
140 else if (!strcmp(arg, "fetch"))
141 *mirror = MIRROR_FETCH;
142 else if (!strcmp(arg, "push"))
143 *mirror = MIRROR_PUSH;
145 return error(_("unknown mirror argument: %s"), arg);
149 static int add(int argc, const char **argv)
151 int fetch = 0, fetch_tags = TAGS_DEFAULT;
152 unsigned mirror = MIRROR_NONE;
153 struct string_list track = STRING_LIST_INIT_NODUP;
154 const char *master = NULL;
155 struct remote *remote;
156 struct strbuf buf = STRBUF_INIT, buf2 = STRBUF_INIT;
157 const char *name, *url;
160 struct option options[] = {
161 OPT_BOOL('f', "fetch", &fetch, N_("fetch the remote branches")),
162 OPT_SET_INT(0, "tags", &fetch_tags,
163 N_("import all tags and associated objects when fetching"),
165 OPT_SET_INT(0, NULL, &fetch_tags,
166 N_("or do not fetch any tag at all (--no-tags)"), TAGS_UNSET),
167 OPT_STRING_LIST('t', "track", &track, N_("branch"),
168 N_("branch(es) to track")),
169 OPT_STRING('m', "master", &master, N_("branch"), N_("master branch")),
170 { OPTION_CALLBACK, 0, "mirror", &mirror, N_("push|fetch"),
171 N_("set up remote as a mirror to push to or fetch from"),
172 PARSE_OPT_OPTARG, parse_mirror_opt },
176 argc = parse_options(argc, argv, NULL, options, builtin_remote_add_usage,
180 usage_with_options(builtin_remote_add_usage, options);
182 if (mirror && master)
183 die(_("specifying a master branch makes no sense with --mirror"));
184 if (mirror && !(mirror & MIRROR_FETCH) && track.nr)
185 die(_("specifying branches to track makes sense only with fetch mirrors"));
190 remote = remote_get(name);
191 if (remote && (remote->url_nr > 1 || strcmp(name, remote->url[0]) ||
192 remote->fetch_refspec_nr))
193 die(_("remote %s already exists."), name);
195 strbuf_addf(&buf2, "refs/heads/test:refs/remotes/%s/test", name);
196 if (!valid_fetch_refspec(buf2.buf))
197 die(_("'%s' is not a valid remote name"), name);
199 strbuf_addf(&buf, "remote.%s.url", name);
200 if (git_config_set(buf.buf, url))
203 if (!mirror || mirror & MIRROR_FETCH) {
205 strbuf_addf(&buf, "remote.%s.fetch", name);
207 string_list_append(&track, "*");
208 for (i = 0; i < track.nr; i++) {
209 if (add_branch(buf.buf, track.items[i].string,
210 name, mirror, &buf2))
215 if (mirror & MIRROR_PUSH) {
217 strbuf_addf(&buf, "remote.%s.mirror", name);
218 if (git_config_set(buf.buf, "true"))
222 if (fetch_tags != TAGS_DEFAULT) {
224 strbuf_addf(&buf, "remote.%s.tagopt", name);
225 if (git_config_set(buf.buf,
226 fetch_tags == TAGS_SET ? "--tags" : "--no-tags"))
230 if (fetch && fetch_remote(name))
235 strbuf_addf(&buf, "refs/remotes/%s/HEAD", name);
238 strbuf_addf(&buf2, "refs/remotes/%s/%s", name, master);
240 if (create_symref(buf.buf, buf2.buf, "remote add"))
241 return error(_("Could not setup master '%s'"), master);
244 strbuf_release(&buf);
245 strbuf_release(&buf2);
246 string_list_clear(&track, 0);
253 struct string_list merge;
257 static struct string_list branch_list;
259 static const char *abbrev_ref(const char *name, const char *prefix)
261 const char *abbrev = skip_prefix(name, prefix);
266 #define abbrev_branch(name) abbrev_ref((name), "refs/heads/")
268 static int config_read_branches(const char *key, const char *value, void *cb)
270 if (!prefixcmp(key, "branch.")) {
271 const char *orig_key = key;
273 struct string_list_item *item;
274 struct branch_info *info;
275 enum { REMOTE, MERGE, REBASE } type;
278 if (!postfixcmp(key, ".remote")) {
279 name = xstrndup(key, strlen(key) - 7);
281 } else if (!postfixcmp(key, ".merge")) {
282 name = xstrndup(key, strlen(key) - 6);
284 } else if (!postfixcmp(key, ".rebase")) {
285 name = xstrndup(key, strlen(key) - 7);
290 item = string_list_insert(&branch_list, name);
293 item->util = xcalloc(sizeof(struct branch_info), 1);
295 if (type == REMOTE) {
296 if (info->remote_name)
297 warning(_("more than one %s"), orig_key);
298 info->remote_name = xstrdup(value);
299 } else if (type == MERGE) {
300 char *space = strchr(value, ' ');
301 value = abbrev_branch(value);
304 merge = xstrndup(value, space - value);
305 string_list_append(&info->merge, merge);
306 value = abbrev_branch(space + 1);
307 space = strchr(value, ' ');
309 string_list_append(&info->merge, xstrdup(value));
311 int v = git_config_maybe_bool(orig_key, value);
314 else if (!strcmp(value, "preserve"))
321 static void read_branches(void)
325 git_config(config_read_branches, NULL);
329 struct remote *remote;
330 struct string_list new, stale, tracked, heads, push;
334 static int get_ref_states(const struct ref *remote_refs, struct ref_states *states)
336 struct ref *fetch_map = NULL, **tail = &fetch_map;
337 struct ref *ref, *stale_refs;
340 for (i = 0; i < states->remote->fetch_refspec_nr; i++)
341 if (get_fetch_map(remote_refs, states->remote->fetch + i, &tail, 1))
342 die(_("Could not get fetch map for refspec %s"),
343 states->remote->fetch_refspec[i]);
345 states->new.strdup_strings = 1;
346 states->tracked.strdup_strings = 1;
347 states->stale.strdup_strings = 1;
348 for (ref = fetch_map; ref; ref = ref->next) {
349 if (!ref->peer_ref || !ref_exists(ref->peer_ref->name))
350 string_list_append(&states->new, abbrev_branch(ref->name));
352 string_list_append(&states->tracked, abbrev_branch(ref->name));
354 stale_refs = get_stale_heads(states->remote->fetch,
355 states->remote->fetch_refspec_nr, fetch_map);
356 for (ref = stale_refs; ref; ref = ref->next) {
357 struct string_list_item *item =
358 string_list_append(&states->stale, abbrev_branch(ref->name));
359 item->util = xstrdup(ref->name);
361 free_refs(stale_refs);
362 free_refs(fetch_map);
364 sort_string_list(&states->new);
365 sort_string_list(&states->tracked);
366 sort_string_list(&states->stale);
375 PUSH_STATUS_CREATE = 0,
377 PUSH_STATUS_UPTODATE,
378 PUSH_STATUS_FASTFORWARD,
379 PUSH_STATUS_OUTOFDATE,
380 PUSH_STATUS_NOTQUERIED
384 static int get_push_ref_states(const struct ref *remote_refs,
385 struct ref_states *states)
387 struct remote *remote = states->remote;
388 struct ref *ref, *local_refs, *push_map;
392 local_refs = get_local_heads();
393 push_map = copy_ref_list(remote_refs);
395 match_push_refs(local_refs, &push_map, remote->push_refspec_nr,
396 remote->push_refspec, MATCH_REFS_NONE);
398 states->push.strdup_strings = 1;
399 for (ref = push_map; ref; ref = ref->next) {
400 struct string_list_item *item;
401 struct push_info *info;
405 hashcpy(ref->new_sha1, ref->peer_ref->new_sha1);
407 item = string_list_append(&states->push,
408 abbrev_branch(ref->peer_ref->name));
409 item->util = xcalloc(sizeof(struct push_info), 1);
411 info->forced = ref->force;
412 info->dest = xstrdup(abbrev_branch(ref->name));
414 if (is_null_sha1(ref->new_sha1)) {
415 info->status = PUSH_STATUS_DELETE;
416 } else if (!hashcmp(ref->old_sha1, ref->new_sha1))
417 info->status = PUSH_STATUS_UPTODATE;
418 else if (is_null_sha1(ref->old_sha1))
419 info->status = PUSH_STATUS_CREATE;
420 else if (has_sha1_file(ref->old_sha1) &&
421 ref_newer(ref->new_sha1, ref->old_sha1))
422 info->status = PUSH_STATUS_FASTFORWARD;
424 info->status = PUSH_STATUS_OUTOFDATE;
426 free_refs(local_refs);
431 static int get_push_ref_states_noquery(struct ref_states *states)
434 struct remote *remote = states->remote;
435 struct string_list_item *item;
436 struct push_info *info;
441 states->push.strdup_strings = 1;
442 if (!remote->push_refspec_nr) {
443 item = string_list_append(&states->push, _("(matching)"));
444 info = item->util = xcalloc(sizeof(struct push_info), 1);
445 info->status = PUSH_STATUS_NOTQUERIED;
446 info->dest = xstrdup(item->string);
448 for (i = 0; i < remote->push_refspec_nr; i++) {
449 struct refspec *spec = remote->push + i;
451 item = string_list_append(&states->push, _("(matching)"));
452 else if (strlen(spec->src))
453 item = string_list_append(&states->push, spec->src);
455 item = string_list_append(&states->push, _("(delete)"));
457 info = item->util = xcalloc(sizeof(struct push_info), 1);
458 info->forced = spec->force;
459 info->status = PUSH_STATUS_NOTQUERIED;
460 info->dest = xstrdup(spec->dst ? spec->dst : item->string);
465 static int get_head_names(const struct ref *remote_refs, struct ref_states *states)
467 struct ref *ref, *matches;
468 struct ref *fetch_map = NULL, **fetch_map_tail = &fetch_map;
469 struct refspec refspec;
473 refspec.src = refspec.dst = "refs/heads/*";
474 states->heads.strdup_strings = 1;
475 get_fetch_map(remote_refs, &refspec, &fetch_map_tail, 0);
476 matches = guess_remote_head(find_ref_by_name(remote_refs, "HEAD"),
478 for (ref = matches; ref; ref = ref->next)
479 string_list_append(&states->heads, abbrev_branch(ref->name));
481 free_refs(fetch_map);
487 struct known_remote {
488 struct known_remote *next;
489 struct remote *remote;
492 struct known_remotes {
493 struct remote *to_delete;
494 struct known_remote *list;
497 static int add_known_remote(struct remote *remote, void *cb_data)
499 struct known_remotes *all = cb_data;
500 struct known_remote *r;
502 if (!strcmp(all->to_delete->name, remote->name))
505 r = xmalloc(sizeof(*r));
512 struct branches_for_remote {
513 struct remote *remote;
514 struct string_list *branches, *skipped;
515 struct known_remotes *keep;
518 static int add_branch_for_removal(const char *refname,
519 const unsigned char *sha1, int flags, void *cb_data)
521 struct branches_for_remote *branches = cb_data;
522 struct refspec refspec;
523 struct string_list_item *item;
524 struct known_remote *kr;
526 memset(&refspec, 0, sizeof(refspec));
527 refspec.dst = (char *)refname;
528 if (remote_find_tracking(branches->remote, &refspec))
531 /* don't delete a branch if another remote also uses it */
532 for (kr = branches->keep->list; kr; kr = kr->next) {
533 memset(&refspec, 0, sizeof(refspec));
534 refspec.dst = (char *)refname;
535 if (!remote_find_tracking(kr->remote, &refspec))
539 /* don't delete non-remote-tracking refs */
540 if (prefixcmp(refname, "refs/remotes/")) {
541 /* advise user how to delete local branches */
542 if (!prefixcmp(refname, "refs/heads/"))
543 string_list_append(branches->skipped,
544 abbrev_branch(refname));
545 /* silently skip over other non-remote refs */
549 /* make sure that symrefs are deleted */
550 if (flags & REF_ISSYMREF)
551 return unlink(git_path("%s", refname));
553 item = string_list_append(branches->branches, refname);
554 item->util = xmalloc(20);
555 hashcpy(item->util, sha1);
563 struct string_list *remote_branches;
566 static int read_remote_branches(const char *refname,
567 const unsigned char *sha1, int flags, void *cb_data)
569 struct rename_info *rename = cb_data;
570 struct strbuf buf = STRBUF_INIT;
571 struct string_list_item *item;
573 unsigned char orig_sha1[20];
576 strbuf_addf(&buf, "refs/remotes/%s/", rename->old);
577 if (!prefixcmp(refname, buf.buf)) {
578 item = string_list_append(rename->remote_branches, xstrdup(refname));
579 symref = resolve_ref_unsafe(refname, orig_sha1, 1, &flag);
580 if (flag & REF_ISSYMREF)
581 item->util = xstrdup(symref);
589 static int migrate_file(struct remote *remote)
591 struct strbuf buf = STRBUF_INIT;
595 strbuf_addf(&buf, "remote.%s.url", remote->name);
596 for (i = 0; i < remote->url_nr; i++)
597 if (git_config_set_multivar(buf.buf, remote->url[i], "^$", 0))
598 return error(_("Could not append '%s' to '%s'"),
599 remote->url[i], buf.buf);
601 strbuf_addf(&buf, "remote.%s.push", remote->name);
602 for (i = 0; i < remote->push_refspec_nr; i++)
603 if (git_config_set_multivar(buf.buf, remote->push_refspec[i], "^$", 0))
604 return error(_("Could not append '%s' to '%s'"),
605 remote->push_refspec[i], buf.buf);
607 strbuf_addf(&buf, "remote.%s.fetch", remote->name);
608 for (i = 0; i < remote->fetch_refspec_nr; i++)
609 if (git_config_set_multivar(buf.buf, remote->fetch_refspec[i], "^$", 0))
610 return error(_("Could not append '%s' to '%s'"),
611 remote->fetch_refspec[i], buf.buf);
612 if (remote->origin == REMOTE_REMOTES)
613 path = git_path("remotes/%s", remote->name);
614 else if (remote->origin == REMOTE_BRANCHES)
615 path = git_path("branches/%s", remote->name);
617 unlink_or_warn(path);
621 static int mv(int argc, const char **argv)
623 struct option options[] = {
626 struct remote *oldremote, *newremote;
627 struct strbuf buf = STRBUF_INIT, buf2 = STRBUF_INIT, buf3 = STRBUF_INIT,
628 old_remote_context = STRBUF_INIT;
629 struct string_list remote_branches = STRING_LIST_INIT_NODUP;
630 struct rename_info rename;
631 int i, refspec_updated = 0;
634 usage_with_options(builtin_remote_rename_usage, options);
636 rename.old = argv[1];
637 rename.new = argv[2];
638 rename.remote_branches = &remote_branches;
640 oldremote = remote_get(rename.old);
642 die(_("No such remote: %s"), rename.old);
644 if (!strcmp(rename.old, rename.new) && oldremote->origin != REMOTE_CONFIG)
645 return migrate_file(oldremote);
647 newremote = remote_get(rename.new);
648 if (newremote && (newremote->url_nr > 1 || newremote->fetch_refspec_nr))
649 die(_("remote %s already exists."), rename.new);
651 strbuf_addf(&buf, "refs/heads/test:refs/remotes/%s/test", rename.new);
652 if (!valid_fetch_refspec(buf.buf))
653 die(_("'%s' is not a valid remote name"), rename.new);
656 strbuf_addf(&buf, "remote.%s", rename.old);
657 strbuf_addf(&buf2, "remote.%s", rename.new);
658 if (git_config_rename_section(buf.buf, buf2.buf) < 1)
659 return error(_("Could not rename config section '%s' to '%s'"),
663 strbuf_addf(&buf, "remote.%s.fetch", rename.new);
664 if (git_config_set_multivar(buf.buf, NULL, NULL, 1))
665 return error(_("Could not remove config section '%s'"), buf.buf);
666 strbuf_addf(&old_remote_context, ":refs/remotes/%s/", rename.old);
667 for (i = 0; i < oldremote->fetch_refspec_nr; i++) {
671 strbuf_addstr(&buf2, oldremote->fetch_refspec[i]);
672 ptr = strstr(buf2.buf, old_remote_context.buf);
676 ptr-buf2.buf + strlen(":refs/remotes/"),
677 strlen(rename.old), rename.new,
680 warning(_("Not updating non-default fetch refspec\n"
682 "\tPlease update the configuration manually if necessary."),
685 if (git_config_set_multivar(buf.buf, buf2.buf, "^$", 0))
686 return error(_("Could not append '%s'"), buf.buf);
690 for (i = 0; i < branch_list.nr; i++) {
691 struct string_list_item *item = branch_list.items + i;
692 struct branch_info *info = item->util;
693 if (info->remote_name && !strcmp(info->remote_name, rename.old)) {
695 strbuf_addf(&buf, "branch.%s.remote", item->string);
696 if (git_config_set(buf.buf, rename.new)) {
697 return error(_("Could not set '%s'"), buf.buf);
702 if (!refspec_updated)
706 * First remove symrefs, then rename the rest, finally create
709 for_each_ref(read_remote_branches, &rename);
710 for (i = 0; i < remote_branches.nr; i++) {
711 struct string_list_item *item = remote_branches.items + i;
713 unsigned char sha1[20];
715 read_ref_full(item->string, sha1, 1, &flag);
716 if (!(flag & REF_ISSYMREF))
718 if (delete_ref(item->string, NULL, REF_NODEREF))
719 die(_("deleting '%s' failed"), item->string);
721 for (i = 0; i < remote_branches.nr; i++) {
722 struct string_list_item *item = remote_branches.items + i;
727 strbuf_addstr(&buf, item->string);
728 strbuf_splice(&buf, strlen("refs/remotes/"), strlen(rename.old),
729 rename.new, strlen(rename.new));
731 strbuf_addf(&buf2, "remote: renamed %s to %s",
732 item->string, buf.buf);
733 if (rename_ref(item->string, buf.buf, buf2.buf))
734 die(_("renaming '%s' failed"), item->string);
736 for (i = 0; i < remote_branches.nr; i++) {
737 struct string_list_item *item = remote_branches.items + i;
742 strbuf_addstr(&buf, item->string);
743 strbuf_splice(&buf, strlen("refs/remotes/"), strlen(rename.old),
744 rename.new, strlen(rename.new));
746 strbuf_addstr(&buf2, item->util);
747 strbuf_splice(&buf2, strlen("refs/remotes/"), strlen(rename.old),
748 rename.new, strlen(rename.new));
750 strbuf_addf(&buf3, "remote: renamed %s to %s",
751 item->string, buf.buf);
752 if (create_symref(buf.buf, buf2.buf, buf3.buf))
753 die(_("creating '%s' failed"), buf.buf);
758 static int remove_branches(struct string_list *branches)
761 for (i = 0; i < branches->nr; i++) {
762 struct string_list_item *item = branches->items + i;
763 const char *refname = item->string;
764 unsigned char *sha1 = item->util;
766 if (delete_ref(refname, sha1, 0))
767 result |= error(_("Could not remove branch %s"), refname);
772 static int rm(int argc, const char **argv)
774 struct option options[] = {
777 struct remote *remote;
778 struct strbuf buf = STRBUF_INIT;
779 struct known_remotes known_remotes = { NULL, NULL };
780 struct string_list branches = STRING_LIST_INIT_DUP;
781 struct string_list skipped = STRING_LIST_INIT_DUP;
782 struct branches_for_remote cb_data;
785 memset(&cb_data, 0, sizeof(cb_data));
786 cb_data.branches = &branches;
787 cb_data.skipped = &skipped;
788 cb_data.keep = &known_remotes;
791 usage_with_options(builtin_remote_rm_usage, options);
793 remote = remote_get(argv[1]);
795 die(_("No such remote: %s"), argv[1]);
797 known_remotes.to_delete = remote;
798 for_each_remote(add_known_remote, &known_remotes);
800 strbuf_addf(&buf, "remote.%s", remote->name);
801 if (git_config_rename_section(buf.buf, NULL) < 1)
802 return error(_("Could not remove config section '%s'"), buf.buf);
805 for (i = 0; i < branch_list.nr; i++) {
806 struct string_list_item *item = branch_list.items + i;
807 struct branch_info *info = item->util;
808 if (info->remote_name && !strcmp(info->remote_name, remote->name)) {
809 const char *keys[] = { "remote", "merge", NULL }, **k;
810 for (k = keys; *k; k++) {
812 strbuf_addf(&buf, "branch.%s.%s",
814 if (git_config_set(buf.buf, NULL)) {
815 strbuf_release(&buf);
823 * We cannot just pass a function to for_each_ref() which deletes
824 * the branches one by one, since for_each_ref() relies on cached
825 * refs, which are invalidated when deleting a branch.
827 cb_data.remote = remote;
828 result = for_each_ref(add_branch_for_removal, &cb_data);
829 strbuf_release(&buf);
832 result = remove_branches(&branches);
833 string_list_clear(&branches, 1);
837 Q_("Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
838 "to delete it, use:",
839 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
840 "to delete them, use:",
842 for (i = 0; i < skipped.nr; i++)
843 fprintf(stderr, " git branch -d %s\n",
844 skipped.items[i].string);
846 string_list_clear(&skipped, 0);
851 static void clear_push_info(void *util, const char *string)
853 struct push_info *info = util;
858 static void free_remote_ref_states(struct ref_states *states)
860 string_list_clear(&states->new, 0);
861 string_list_clear(&states->stale, 1);
862 string_list_clear(&states->tracked, 0);
863 string_list_clear(&states->heads, 0);
864 string_list_clear_func(&states->push, clear_push_info);
867 static int append_ref_to_tracked_list(const char *refname,
868 const unsigned char *sha1, int flags, void *cb_data)
870 struct ref_states *states = cb_data;
871 struct refspec refspec;
873 if (flags & REF_ISSYMREF)
876 memset(&refspec, 0, sizeof(refspec));
877 refspec.dst = (char *)refname;
878 if (!remote_find_tracking(states->remote, &refspec))
879 string_list_append(&states->tracked, abbrev_branch(refspec.src));
884 static int get_remote_ref_states(const char *name,
885 struct ref_states *states,
888 struct transport *transport;
889 const struct ref *remote_refs;
891 states->remote = remote_get(name);
893 return error(_("No such remote: %s"), name);
898 transport = transport_get(states->remote, states->remote->url_nr > 0 ?
899 states->remote->url[0] : NULL);
900 remote_refs = transport_get_remote_refs(transport);
901 transport_disconnect(transport);
904 if (query & GET_REF_STATES)
905 get_ref_states(remote_refs, states);
906 if (query & GET_HEAD_NAMES)
907 get_head_names(remote_refs, states);
908 if (query & GET_PUSH_REF_STATES)
909 get_push_ref_states(remote_refs, states);
911 for_each_ref(append_ref_to_tracked_list, states);
912 sort_string_list(&states->tracked);
913 get_push_ref_states_noquery(states);
920 struct string_list *list;
921 struct ref_states *states;
926 static int add_remote_to_show_info(struct string_list_item *item, void *cb_data)
928 struct show_info *info = cb_data;
929 int n = strlen(item->string);
932 string_list_insert(info->list, item->string);
936 static int show_remote_info_item(struct string_list_item *item, void *cb_data)
938 struct show_info *info = cb_data;
939 struct ref_states *states = info->states;
940 const char *name = item->string;
942 if (states->queried) {
943 const char *fmt = "%s";
944 const char *arg = "";
945 if (string_list_has_string(&states->new, name)) {
946 fmt = _(" new (next fetch will store in remotes/%s)");
947 arg = states->remote->name;
948 } else if (string_list_has_string(&states->tracked, name))
950 else if (string_list_has_string(&states->stale, name))
951 arg = _(" stale (use 'git remote prune' to remove)");
954 printf(" %-*s", info->width, name);
958 printf(" %s\n", name);
963 static int add_local_to_show_info(struct string_list_item *branch_item, void *cb_data)
965 struct show_info *show_info = cb_data;
966 struct ref_states *states = show_info->states;
967 struct branch_info *branch_info = branch_item->util;
968 struct string_list_item *item;
971 if (!branch_info->merge.nr || !branch_info->remote_name ||
972 strcmp(states->remote->name, branch_info->remote_name))
974 if ((n = strlen(branch_item->string)) > show_info->width)
975 show_info->width = n;
976 if (branch_info->rebase)
977 show_info->any_rebase = 1;
979 item = string_list_insert(show_info->list, branch_item->string);
980 item->util = branch_info;
985 static int show_local_info_item(struct string_list_item *item, void *cb_data)
987 struct show_info *show_info = cb_data;
988 struct branch_info *branch_info = item->util;
989 struct string_list *merge = &branch_info->merge;
993 if (branch_info->rebase && branch_info->merge.nr > 1) {
994 error(_("invalid branch.%s.merge; cannot rebase onto > 1 branch"),
999 printf(" %-*s ", show_info->width, item->string);
1000 if (branch_info->rebase) {
1001 printf_ln(_("rebases onto remote %s"), merge->items[0].string);
1003 } else if (show_info->any_rebase) {
1004 printf_ln(_(" merges with remote %s"), merge->items[0].string);
1005 also = _(" and with remote");
1007 printf_ln(_("merges with remote %s"), merge->items[0].string);
1008 also = _(" and with remote");
1010 for (i = 1; i < merge->nr; i++)
1011 printf(" %-*s %s %s\n", show_info->width, "", also,
1012 merge->items[i].string);
1017 static int add_push_to_show_info(struct string_list_item *push_item, void *cb_data)
1019 struct show_info *show_info = cb_data;
1020 struct push_info *push_info = push_item->util;
1021 struct string_list_item *item;
1023 if ((n = strlen(push_item->string)) > show_info->width)
1024 show_info->width = n;
1025 if ((n = strlen(push_info->dest)) > show_info->width2)
1026 show_info->width2 = n;
1027 item = string_list_append(show_info->list, push_item->string);
1028 item->util = push_item->util;
1033 * Sorting comparison for a string list that has push_info
1034 * structs in its util field
1036 static int cmp_string_with_push(const void *va, const void *vb)
1038 const struct string_list_item *a = va;
1039 const struct string_list_item *b = vb;
1040 const struct push_info *a_push = a->util;
1041 const struct push_info *b_push = b->util;
1042 int cmp = strcmp(a->string, b->string);
1043 return cmp ? cmp : strcmp(a_push->dest, b_push->dest);
1046 static int show_push_info_item(struct string_list_item *item, void *cb_data)
1048 struct show_info *show_info = cb_data;
1049 struct push_info *push_info = item->util;
1050 const char *src = item->string, *status = NULL;
1052 switch (push_info->status) {
1053 case PUSH_STATUS_CREATE:
1054 status = _("create");
1056 case PUSH_STATUS_DELETE:
1057 status = _("delete");
1060 case PUSH_STATUS_UPTODATE:
1061 status = _("up to date");
1063 case PUSH_STATUS_FASTFORWARD:
1064 status = _("fast-forwardable");
1066 case PUSH_STATUS_OUTOFDATE:
1067 status = _("local out of date");
1069 case PUSH_STATUS_NOTQUERIED:
1073 if (push_info->forced)
1074 printf_ln(_(" %-*s forces to %-*s (%s)"), show_info->width, src,
1075 show_info->width2, push_info->dest, status);
1077 printf_ln(_(" %-*s pushes to %-*s (%s)"), show_info->width, src,
1078 show_info->width2, push_info->dest, status);
1080 if (push_info->forced)
1081 printf_ln(_(" %-*s forces to %s"), show_info->width, src,
1084 printf_ln(_(" %-*s pushes to %s"), show_info->width, src,
1090 static int get_one_entry(struct remote *remote, void *priv)
1092 struct string_list *list = priv;
1093 struct strbuf url_buf = STRBUF_INIT;
1097 if (remote->url_nr > 0) {
1098 strbuf_addf(&url_buf, "%s (fetch)", remote->url[0]);
1099 string_list_append(list, remote->name)->util =
1100 strbuf_detach(&url_buf, NULL);
1102 string_list_append(list, remote->name)->util = NULL;
1103 if (remote->pushurl_nr) {
1104 url = remote->pushurl;
1105 url_nr = remote->pushurl_nr;
1108 url_nr = remote->url_nr;
1110 for (i = 0; i < url_nr; i++)
1112 strbuf_addf(&url_buf, "%s (push)", url[i]);
1113 string_list_append(list, remote->name)->util =
1114 strbuf_detach(&url_buf, NULL);
1120 static int show_all(void)
1122 struct string_list list = STRING_LIST_INIT_NODUP;
1125 list.strdup_strings = 1;
1126 result = for_each_remote(get_one_entry, &list);
1131 sort_string_list(&list);
1132 for (i = 0; i < list.nr; i++) {
1133 struct string_list_item *item = list.items + i;
1135 printf("%s\t%s\n", item->string,
1136 item->util ? (const char *)item->util : "");
1138 if (i && !strcmp((item - 1)->string, item->string))
1140 printf("%s\n", item->string);
1144 string_list_clear(&list, 1);
1148 static int show(int argc, const char **argv)
1150 int no_query = 0, result = 0, query_flag = 0;
1151 struct option options[] = {
1152 OPT_BOOL('n', NULL, &no_query, N_("do not query remotes")),
1155 struct ref_states states;
1156 struct string_list info_list = STRING_LIST_INIT_NODUP;
1157 struct show_info info;
1159 argc = parse_options(argc, argv, NULL, options, builtin_remote_show_usage,
1166 query_flag = (GET_REF_STATES | GET_HEAD_NAMES | GET_PUSH_REF_STATES);
1168 memset(&states, 0, sizeof(states));
1169 memset(&info, 0, sizeof(info));
1170 info.states = &states;
1171 info.list = &info_list;
1172 for (; argc; argc--, argv++) {
1177 get_remote_ref_states(*argv, &states, query_flag);
1179 printf_ln(_("* remote %s"), *argv);
1180 printf_ln(_(" Fetch URL: %s"), states.remote->url_nr > 0 ?
1181 states.remote->url[0] : _("(no URL)"));
1182 if (states.remote->pushurl_nr) {
1183 url = states.remote->pushurl;
1184 url_nr = states.remote->pushurl_nr;
1186 url = states.remote->url;
1187 url_nr = states.remote->url_nr;
1189 for (i = 0; i < url_nr; i++)
1190 printf_ln(_(" Push URL: %s"), url[i]);
1192 printf_ln(_(" Push URL: %s"), "(no URL)");
1194 printf_ln(_(" HEAD branch: %s"), "(not queried)");
1195 else if (!states.heads.nr)
1196 printf_ln(_(" HEAD branch: %s"), "(unknown)");
1197 else if (states.heads.nr == 1)
1198 printf_ln(_(" HEAD branch: %s"), states.heads.items[0].string);
1200 printf(_(" HEAD branch (remote HEAD is ambiguous,"
1201 " may be one of the following):\n"));
1202 for (i = 0; i < states.heads.nr; i++)
1203 printf(" %s\n", states.heads.items[i].string);
1206 /* remote branch info */
1208 for_each_string_list(&states.new, add_remote_to_show_info, &info);
1209 for_each_string_list(&states.tracked, add_remote_to_show_info, &info);
1210 for_each_string_list(&states.stale, add_remote_to_show_info, &info);
1212 printf_ln(Q_(" Remote branch:%s",
1213 " Remote branches:%s",
1215 no_query ? _(" (status not queried)") : "");
1216 for_each_string_list(info.list, show_remote_info_item, &info);
1217 string_list_clear(info.list, 0);
1221 info.any_rebase = 0;
1222 for_each_string_list(&branch_list, add_local_to_show_info, &info);
1224 printf_ln(Q_(" Local branch configured for 'git pull':",
1225 " Local branches configured for 'git pull':",
1227 for_each_string_list(info.list, show_local_info_item, &info);
1228 string_list_clear(info.list, 0);
1231 if (states.remote->mirror)
1232 printf_ln(_(" Local refs will be mirrored by 'git push'"));
1234 info.width = info.width2 = 0;
1235 for_each_string_list(&states.push, add_push_to_show_info, &info);
1236 qsort(info.list->items, info.list->nr,
1237 sizeof(*info.list->items), cmp_string_with_push);
1239 printf_ln(Q_(" Local ref configured for 'git push'%s:",
1240 " Local refs configured for 'git push'%s:",
1242 no_query ? _(" (status not queried)") : "");
1243 for_each_string_list(info.list, show_push_info_item, &info);
1244 string_list_clear(info.list, 0);
1246 free_remote_ref_states(&states);
1252 static int set_head(int argc, const char **argv)
1254 int i, opt_a = 0, opt_d = 0, result = 0;
1255 struct strbuf buf = STRBUF_INIT, buf2 = STRBUF_INIT;
1256 char *head_name = NULL;
1258 struct option options[] = {
1259 OPT_BOOL('a', "auto", &opt_a,
1260 N_("set refs/remotes/<name>/HEAD according to remote")),
1261 OPT_BOOL('d', "delete", &opt_d,
1262 N_("delete refs/remotes/<name>/HEAD")),
1265 argc = parse_options(argc, argv, NULL, options, builtin_remote_sethead_usage,
1268 strbuf_addf(&buf, "refs/remotes/%s/HEAD", argv[0]);
1270 if (!opt_a && !opt_d && argc == 2) {
1271 head_name = xstrdup(argv[1]);
1272 } else if (opt_a && !opt_d && argc == 1) {
1273 struct ref_states states;
1274 memset(&states, 0, sizeof(states));
1275 get_remote_ref_states(argv[0], &states, GET_HEAD_NAMES);
1276 if (!states.heads.nr)
1277 result |= error(_("Cannot determine remote HEAD"));
1278 else if (states.heads.nr > 1) {
1279 result |= error(_("Multiple remote HEAD branches. "
1280 "Please choose one explicitly with:"));
1281 for (i = 0; i < states.heads.nr; i++)
1282 fprintf(stderr, " git remote set-head %s %s\n",
1283 argv[0], states.heads.items[i].string);
1285 head_name = xstrdup(states.heads.items[0].string);
1286 free_remote_ref_states(&states);
1287 } else if (opt_d && !opt_a && argc == 1) {
1288 if (delete_ref(buf.buf, NULL, REF_NODEREF))
1289 result |= error(_("Could not delete %s"), buf.buf);
1291 usage_with_options(builtin_remote_sethead_usage, options);
1294 strbuf_addf(&buf2, "refs/remotes/%s/%s", argv[0], head_name);
1295 /* make sure it's valid */
1296 if (!ref_exists(buf2.buf))
1297 result |= error(_("Not a valid ref: %s"), buf2.buf);
1298 else if (create_symref(buf.buf, buf2.buf, "remote set-head"))
1299 result |= error(_("Could not setup %s"), buf.buf);
1301 printf("%s/HEAD set to %s\n", argv[0], head_name);
1305 strbuf_release(&buf);
1306 strbuf_release(&buf2);
1310 static int prune_remote(const char *remote, int dry_run)
1313 struct ref_states states;
1314 const char *dangling_msg = dry_run
1315 ? _(" %s will become dangling!")
1316 : _(" %s has become dangling!");
1318 memset(&states, 0, sizeof(states));
1319 get_remote_ref_states(remote, &states, GET_REF_STATES);
1321 if (states.stale.nr) {
1322 printf_ln(_("Pruning %s"), remote);
1323 printf_ln(_("URL: %s"),
1324 states.remote->url_nr
1325 ? states.remote->url[0]
1329 for (i = 0; i < states.stale.nr; i++) {
1330 const char *refname = states.stale.items[i].util;
1333 result |= delete_ref(refname, NULL, 0);
1336 printf_ln(_(" * [would prune] %s"),
1337 abbrev_ref(refname, "refs/remotes/"));
1339 printf_ln(_(" * [pruned] %s"),
1340 abbrev_ref(refname, "refs/remotes/"));
1341 warn_dangling_symref(stdout, dangling_msg, refname);
1344 free_remote_ref_states(&states);
1348 static int prune(int argc, const char **argv)
1350 int dry_run = 0, result = 0;
1351 struct option options[] = {
1352 OPT__DRY_RUN(&dry_run, N_("dry run")),
1356 argc = parse_options(argc, argv, NULL, options, builtin_remote_prune_usage,
1360 usage_with_options(builtin_remote_prune_usage, options);
1362 for (; argc; argc--, argv++)
1363 result |= prune_remote(*argv, dry_run);
1368 static int get_remote_default(const char *key, const char *value, void *priv)
1370 if (strcmp(key, "remotes.default") == 0) {
1377 static int update(int argc, const char **argv)
1380 struct option options[] = {
1381 OPT_BOOL('p', "prune", &prune,
1382 N_("prune remotes after fetching")),
1385 struct argv_array fetch_argv = ARGV_ARRAY_INIT;
1386 int default_defined = 0;
1389 argc = parse_options(argc, argv, NULL, options, builtin_remote_update_usage,
1390 PARSE_OPT_KEEP_ARGV0);
1392 argv_array_push(&fetch_argv, "fetch");
1395 argv_array_push(&fetch_argv, prune ? "--prune" : "--no-prune");
1397 argv_array_push(&fetch_argv, "-v");
1398 argv_array_push(&fetch_argv, "--multiple");
1400 argv_array_push(&fetch_argv, "default");
1401 for (i = 1; i < argc; i++)
1402 argv_array_push(&fetch_argv, argv[i]);
1404 if (strcmp(fetch_argv.argv[fetch_argv.argc-1], "default") == 0) {
1405 git_config(get_remote_default, &default_defined);
1406 if (!default_defined) {
1407 argv_array_pop(&fetch_argv);
1408 argv_array_push(&fetch_argv, "--all");
1412 retval = run_command_v_opt(fetch_argv.argv, RUN_GIT_CMD);
1413 argv_array_clear(&fetch_argv);
1417 static int remove_all_fetch_refspecs(const char *remote, const char *key)
1419 return git_config_set_multivar(key, NULL, NULL, 1);
1422 static int add_branches(struct remote *remote, const char **branches,
1425 const char *remotename = remote->name;
1426 int mirror = remote->mirror;
1427 struct strbuf refspec = STRBUF_INIT;
1429 for (; *branches; branches++)
1430 if (add_branch(key, *branches, remotename, mirror, &refspec)) {
1431 strbuf_release(&refspec);
1435 strbuf_release(&refspec);
1439 static int set_remote_branches(const char *remotename, const char **branches,
1442 struct strbuf key = STRBUF_INIT;
1443 struct remote *remote;
1445 strbuf_addf(&key, "remote.%s.fetch", remotename);
1447 if (!remote_is_configured(remotename))
1448 die(_("No such remote '%s'"), remotename);
1449 remote = remote_get(remotename);
1451 if (!add_mode && remove_all_fetch_refspecs(remotename, key.buf)) {
1452 strbuf_release(&key);
1455 if (add_branches(remote, branches, key.buf)) {
1456 strbuf_release(&key);
1460 strbuf_release(&key);
1464 static int set_branches(int argc, const char **argv)
1467 struct option options[] = {
1468 OPT_BOOL('\0', "add", &add_mode, N_("add branch")),
1472 argc = parse_options(argc, argv, NULL, options,
1473 builtin_remote_setbranches_usage, 0);
1475 error(_("no remote specified"));
1476 usage_with_options(builtin_remote_setbranches_usage, options);
1480 return set_remote_branches(argv[0], argv + 1, add_mode);
1483 static int set_url(int argc, const char **argv)
1485 int i, push_mode = 0, add_mode = 0, delete_mode = 0;
1486 int matches = 0, negative_matches = 0;
1487 const char *remotename = NULL;
1488 const char *newurl = NULL;
1489 const char *oldurl = NULL;
1490 struct remote *remote;
1492 const char **urlset;
1494 struct strbuf name_buf = STRBUF_INIT;
1495 struct option options[] = {
1496 OPT_BOOL('\0', "push", &push_mode,
1497 N_("manipulate push URLs")),
1498 OPT_BOOL('\0', "add", &add_mode,
1500 OPT_BOOL('\0', "delete", &delete_mode,
1504 argc = parse_options(argc, argv, NULL, options, builtin_remote_seturl_usage,
1505 PARSE_OPT_KEEP_ARGV0);
1507 if (add_mode && delete_mode)
1508 die(_("--add --delete doesn't make sense"));
1510 if (argc < 3 || argc > 4 || ((add_mode || delete_mode) && argc != 3))
1511 usage_with_options(builtin_remote_seturl_usage, options);
1513 remotename = argv[1];
1521 if (!remote_is_configured(remotename))
1522 die(_("No such remote '%s'"), remotename);
1523 remote = remote_get(remotename);
1526 strbuf_addf(&name_buf, "remote.%s.pushurl", remotename);
1527 urlset = remote->pushurl;
1528 urlset_nr = remote->pushurl_nr;
1530 strbuf_addf(&name_buf, "remote.%s.url", remotename);
1531 urlset = remote->url;
1532 urlset_nr = remote->url_nr;
1535 /* Special cases that add new entry. */
1536 if ((!oldurl && !delete_mode) || add_mode) {
1538 git_config_set_multivar(name_buf.buf, newurl,
1541 git_config_set(name_buf.buf, newurl);
1542 strbuf_release(&name_buf);
1546 /* Old URL specified. Demand that one matches. */
1547 if (regcomp(&old_regex, oldurl, REG_EXTENDED))
1548 die(_("Invalid old URL pattern: %s"), oldurl);
1550 for (i = 0; i < urlset_nr; i++)
1551 if (!regexec(&old_regex, urlset[i], 0, NULL, 0))
1555 if (!delete_mode && !matches)
1556 die(_("No such URL found: %s"), oldurl);
1557 if (delete_mode && !negative_matches && !push_mode)
1558 die(_("Will not delete all non-push URLs"));
1560 regfree(&old_regex);
1563 git_config_set_multivar(name_buf.buf, newurl, oldurl, 0);
1565 git_config_set_multivar(name_buf.buf, NULL, oldurl, 1);
1569 int cmd_remote(int argc, const char **argv, const char *prefix)
1571 struct option options[] = {
1572 OPT__VERBOSE(&verbose, N_("be verbose; must be placed before a subcommand")),
1577 argc = parse_options(argc, argv, prefix, options, builtin_remote_usage,
1578 PARSE_OPT_STOP_AT_NON_OPTION);
1581 result = show_all();
1582 else if (!strcmp(argv[0], "add"))
1583 result = add(argc, argv);
1584 else if (!strcmp(argv[0], "rename"))
1585 result = mv(argc, argv);
1586 else if (!strcmp(argv[0], "rm") || !strcmp(argv[0], "remove"))
1587 result = rm(argc, argv);
1588 else if (!strcmp(argv[0], "set-head"))
1589 result = set_head(argc, argv);
1590 else if (!strcmp(argv[0], "set-branches"))
1591 result = set_branches(argc, argv);
1592 else if (!strcmp(argv[0], "set-url"))
1593 result = set_url(argc, argv);
1594 else if (!strcmp(argv[0], "show"))
1595 result = show(argc, argv);
1596 else if (!strcmp(argv[0], "prune"))
1597 result = prune(argc, argv);
1598 else if (!strcmp(argv[0], "update"))
1599 result = update(argc, argv);
1601 error(_("Unknown subcommand: %s"), argv[0]);
1602 usage_with_options(builtin_remote_usage, options);
1605 return result ? 1 : 0;