2 #include "parse-options.h"
5 #include "string-list.h"
7 #include "run-command.h"
10 static const char * const builtin_remote_usage[] = {
11 N_("git remote [-v | --verbose]"),
12 N_("git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--mirror=<fetch|push>] <name> <url>"),
13 N_("git remote rename <old> <new>"),
14 N_("git remote remove <name>"),
15 N_("git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"),
16 N_("git remote [-v | --verbose] show [-n] <name>"),
17 N_("git remote prune [-n | --dry-run] <name>"),
18 N_("git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"),
19 N_("git remote set-branches [--add] <name> <branch>..."),
20 N_("git remote set-url [--push] <name> <newurl> [<oldurl>]"),
21 N_("git remote set-url --add <name> <newurl>"),
22 N_("git remote set-url --delete <name> <url>"),
26 static const char * const builtin_remote_add_usage[] = {
27 N_("git remote add [<options>] <name> <url>"),
31 static const char * const builtin_remote_rename_usage[] = {
32 N_("git remote rename <old> <new>"),
36 static const char * const builtin_remote_rm_usage[] = {
37 N_("git remote remove <name>"),
41 static const char * const builtin_remote_sethead_usage[] = {
42 N_("git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"),
46 static const char * const builtin_remote_setbranches_usage[] = {
47 N_("git remote set-branches <name> <branch>..."),
48 N_("git remote set-branches --add <name> <branch>..."),
52 static const char * const builtin_remote_show_usage[] = {
53 N_("git remote show [<options>] <name>"),
57 static const char * const builtin_remote_prune_usage[] = {
58 N_("git remote prune [<options>] <name>"),
62 static const char * const builtin_remote_update_usage[] = {
63 N_("git remote update [<options>] [<group> | <remote>]..."),
67 static const char * const builtin_remote_seturl_usage[] = {
68 N_("git remote set-url [--push] <name> <newurl> [<oldurl>]"),
69 N_("git remote set-url --add <name> <newurl>"),
70 N_("git remote set-url --delete <name> <url>"),
74 #define GET_REF_STATES (1<<0)
75 #define GET_HEAD_NAMES (1<<1)
76 #define GET_PUSH_REF_STATES (1<<2)
80 static inline int postfixcmp(const char *string, const char *postfix)
82 int len1 = strlen(string), len2 = strlen(postfix);
85 return strcmp(string + len1 - len2, postfix);
88 static int fetch_remote(const char *name)
90 const char *argv[] = { "fetch", name, NULL, NULL };
95 printf_ln(_("Updating %s"), name);
96 if (run_command_v_opt(argv, RUN_GIT_CMD))
97 return error(_("Could not fetch %s"), name);
107 #define MIRROR_NONE 0
108 #define MIRROR_FETCH 1
109 #define MIRROR_PUSH 2
110 #define MIRROR_BOTH (MIRROR_FETCH|MIRROR_PUSH)
112 static int add_branch(const char *key, const char *branchname,
113 const char *remotename, int mirror, struct strbuf *tmp)
116 strbuf_addch(tmp, '+');
118 strbuf_addf(tmp, "refs/%s:refs/%s",
119 branchname, branchname);
121 strbuf_addf(tmp, "refs/heads/%s:refs/remotes/%s/%s",
122 branchname, remotename, branchname);
123 return git_config_set_multivar(key, tmp->buf, "^$", 0);
126 static const char mirror_advice[] =
127 N_("--mirror is dangerous and deprecated; please\n"
128 "\t use --mirror=fetch or --mirror=push instead");
130 static int parse_mirror_opt(const struct option *opt, const char *arg, int not)
132 unsigned *mirror = opt->value;
134 *mirror = MIRROR_NONE;
136 warning("%s", _(mirror_advice));
137 *mirror = MIRROR_BOTH;
139 else if (!strcmp(arg, "fetch"))
140 *mirror = MIRROR_FETCH;
141 else if (!strcmp(arg, "push"))
142 *mirror = MIRROR_PUSH;
144 return error(_("unknown mirror argument: %s"), arg);
148 static int add(int argc, const char **argv)
150 int fetch = 0, fetch_tags = TAGS_DEFAULT;
151 unsigned mirror = MIRROR_NONE;
152 struct string_list track = STRING_LIST_INIT_NODUP;
153 const char *master = NULL;
154 struct remote *remote;
155 struct strbuf buf = STRBUF_INIT, buf2 = STRBUF_INIT;
156 const char *name, *url;
159 struct option options[] = {
160 OPT_BOOL('f', "fetch", &fetch, N_("fetch the remote branches")),
161 OPT_SET_INT(0, "tags", &fetch_tags,
162 N_("import all tags and associated objects when fetching"),
164 OPT_SET_INT(0, NULL, &fetch_tags,
165 N_("or do not fetch any tag at all (--no-tags)"), TAGS_UNSET),
166 OPT_STRING_LIST('t', "track", &track, N_("branch"),
167 N_("branch(es) to track")),
168 OPT_STRING('m', "master", &master, N_("branch"), N_("master branch")),
169 { OPTION_CALLBACK, 0, "mirror", &mirror, N_("push|fetch"),
170 N_("set up remote as a mirror to push to or fetch from"),
171 PARSE_OPT_OPTARG, parse_mirror_opt },
175 argc = parse_options(argc, argv, NULL, options, builtin_remote_add_usage,
179 usage_with_options(builtin_remote_add_usage, options);
181 if (mirror && master)
182 die(_("specifying a master branch makes no sense with --mirror"));
183 if (mirror && !(mirror & MIRROR_FETCH) && track.nr)
184 die(_("specifying branches to track makes sense only with fetch mirrors"));
189 remote = remote_get(name);
190 if (remote && (remote->url_nr > 1 || strcmp(name, remote->url[0]) ||
191 remote->fetch_refspec_nr))
192 die(_("remote %s already exists."), name);
194 strbuf_addf(&buf2, "refs/heads/test:refs/remotes/%s/test", name);
195 if (!valid_fetch_refspec(buf2.buf))
196 die(_("'%s' is not a valid remote name"), name);
198 strbuf_addf(&buf, "remote.%s.url", name);
199 if (git_config_set(buf.buf, url))
202 if (!mirror || mirror & MIRROR_FETCH) {
204 strbuf_addf(&buf, "remote.%s.fetch", name);
206 string_list_append(&track, "*");
207 for (i = 0; i < track.nr; i++) {
208 if (add_branch(buf.buf, track.items[i].string,
209 name, mirror, &buf2))
214 if (mirror & MIRROR_PUSH) {
216 strbuf_addf(&buf, "remote.%s.mirror", name);
217 if (git_config_set(buf.buf, "true"))
221 if (fetch_tags != TAGS_DEFAULT) {
223 strbuf_addf(&buf, "remote.%s.tagopt", name);
224 if (git_config_set(buf.buf,
225 fetch_tags == TAGS_SET ? "--tags" : "--no-tags"))
229 if (fetch && fetch_remote(name))
234 strbuf_addf(&buf, "refs/remotes/%s/HEAD", name);
237 strbuf_addf(&buf2, "refs/remotes/%s/%s", name, master);
239 if (create_symref(buf.buf, buf2.buf, "remote add"))
240 return error(_("Could not setup master '%s'"), master);
243 strbuf_release(&buf);
244 strbuf_release(&buf2);
245 string_list_clear(&track, 0);
252 struct string_list merge;
256 static struct string_list branch_list;
258 static const char *abbrev_ref(const char *name, const char *prefix)
260 const char *abbrev = skip_prefix(name, prefix);
265 #define abbrev_branch(name) abbrev_ref((name), "refs/heads/")
267 static int config_read_branches(const char *key, const char *value, void *cb)
269 if (!prefixcmp(key, "branch.")) {
270 const char *orig_key = key;
272 struct string_list_item *item;
273 struct branch_info *info;
274 enum { REMOTE, MERGE, REBASE } type;
277 if (!postfixcmp(key, ".remote")) {
278 name = xstrndup(key, strlen(key) - 7);
280 } else if (!postfixcmp(key, ".merge")) {
281 name = xstrndup(key, strlen(key) - 6);
283 } else if (!postfixcmp(key, ".rebase")) {
284 name = xstrndup(key, strlen(key) - 7);
289 item = string_list_insert(&branch_list, name);
292 item->util = xcalloc(sizeof(struct branch_info), 1);
294 if (type == REMOTE) {
295 if (info->remote_name)
296 warning(_("more than one %s"), orig_key);
297 info->remote_name = xstrdup(value);
298 } else if (type == MERGE) {
299 char *space = strchr(value, ' ');
300 value = abbrev_branch(value);
303 merge = xstrndup(value, space - value);
304 string_list_append(&info->merge, merge);
305 value = abbrev_branch(space + 1);
306 space = strchr(value, ' ');
308 string_list_append(&info->merge, xstrdup(value));
310 info->rebase = git_config_bool(orig_key, value);
315 static void read_branches(void)
319 git_config(config_read_branches, NULL);
323 struct remote *remote;
324 struct string_list new, stale, tracked, heads, push;
328 static int get_ref_states(const struct ref *remote_refs, struct ref_states *states)
330 struct ref *fetch_map = NULL, **tail = &fetch_map;
331 struct ref *ref, *stale_refs;
334 for (i = 0; i < states->remote->fetch_refspec_nr; i++)
335 if (get_fetch_map(remote_refs, states->remote->fetch + i, &tail, 1))
336 die(_("Could not get fetch map for refspec %s"),
337 states->remote->fetch_refspec[i]);
339 states->new.strdup_strings = 1;
340 states->tracked.strdup_strings = 1;
341 states->stale.strdup_strings = 1;
342 for (ref = fetch_map; ref; ref = ref->next) {
343 if (!ref->peer_ref || !ref_exists(ref->peer_ref->name))
344 string_list_append(&states->new, abbrev_branch(ref->name));
346 string_list_append(&states->tracked, abbrev_branch(ref->name));
348 stale_refs = get_stale_heads(states->remote->fetch,
349 states->remote->fetch_refspec_nr, fetch_map);
350 for (ref = stale_refs; ref; ref = ref->next) {
351 struct string_list_item *item =
352 string_list_append(&states->stale, abbrev_branch(ref->name));
353 item->util = xstrdup(ref->name);
355 free_refs(stale_refs);
356 free_refs(fetch_map);
358 sort_string_list(&states->new);
359 sort_string_list(&states->tracked);
360 sort_string_list(&states->stale);
369 PUSH_STATUS_CREATE = 0,
371 PUSH_STATUS_UPTODATE,
372 PUSH_STATUS_FASTFORWARD,
373 PUSH_STATUS_OUTOFDATE,
374 PUSH_STATUS_NOTQUERIED
378 static int get_push_ref_states(const struct ref *remote_refs,
379 struct ref_states *states)
381 struct remote *remote = states->remote;
382 struct ref *ref, *local_refs, *push_map;
386 local_refs = get_local_heads();
387 push_map = copy_ref_list(remote_refs);
389 match_push_refs(local_refs, &push_map, remote->push_refspec_nr,
390 remote->push_refspec, MATCH_REFS_NONE);
392 states->push.strdup_strings = 1;
393 for (ref = push_map; ref; ref = ref->next) {
394 struct string_list_item *item;
395 struct push_info *info;
399 hashcpy(ref->new_sha1, ref->peer_ref->new_sha1);
401 item = string_list_append(&states->push,
402 abbrev_branch(ref->peer_ref->name));
403 item->util = xcalloc(sizeof(struct push_info), 1);
405 info->forced = ref->force;
406 info->dest = xstrdup(abbrev_branch(ref->name));
408 if (is_null_sha1(ref->new_sha1)) {
409 info->status = PUSH_STATUS_DELETE;
410 } else if (!hashcmp(ref->old_sha1, ref->new_sha1))
411 info->status = PUSH_STATUS_UPTODATE;
412 else if (is_null_sha1(ref->old_sha1))
413 info->status = PUSH_STATUS_CREATE;
414 else if (has_sha1_file(ref->old_sha1) &&
415 ref_newer(ref->new_sha1, ref->old_sha1))
416 info->status = PUSH_STATUS_FASTFORWARD;
418 info->status = PUSH_STATUS_OUTOFDATE;
420 free_refs(local_refs);
425 static int get_push_ref_states_noquery(struct ref_states *states)
428 struct remote *remote = states->remote;
429 struct string_list_item *item;
430 struct push_info *info;
435 states->push.strdup_strings = 1;
436 if (!remote->push_refspec_nr) {
437 item = string_list_append(&states->push, _("(matching)"));
438 info = item->util = xcalloc(sizeof(struct push_info), 1);
439 info->status = PUSH_STATUS_NOTQUERIED;
440 info->dest = xstrdup(item->string);
442 for (i = 0; i < remote->push_refspec_nr; i++) {
443 struct refspec *spec = remote->push + i;
445 item = string_list_append(&states->push, _("(matching)"));
446 else if (strlen(spec->src))
447 item = string_list_append(&states->push, spec->src);
449 item = string_list_append(&states->push, _("(delete)"));
451 info = item->util = xcalloc(sizeof(struct push_info), 1);
452 info->forced = spec->force;
453 info->status = PUSH_STATUS_NOTQUERIED;
454 info->dest = xstrdup(spec->dst ? spec->dst : item->string);
459 static int get_head_names(const struct ref *remote_refs, struct ref_states *states)
461 struct ref *ref, *matches;
462 struct ref *fetch_map = NULL, **fetch_map_tail = &fetch_map;
463 struct refspec refspec;
467 refspec.src = refspec.dst = "refs/heads/*";
468 states->heads.strdup_strings = 1;
469 get_fetch_map(remote_refs, &refspec, &fetch_map_tail, 0);
470 matches = guess_remote_head(find_ref_by_name(remote_refs, "HEAD"),
472 for (ref = matches; ref; ref = ref->next)
473 string_list_append(&states->heads, abbrev_branch(ref->name));
475 free_refs(fetch_map);
481 struct known_remote {
482 struct known_remote *next;
483 struct remote *remote;
486 struct known_remotes {
487 struct remote *to_delete;
488 struct known_remote *list;
491 static int add_known_remote(struct remote *remote, void *cb_data)
493 struct known_remotes *all = cb_data;
494 struct known_remote *r;
496 if (!strcmp(all->to_delete->name, remote->name))
499 r = xmalloc(sizeof(*r));
506 struct branches_for_remote {
507 struct remote *remote;
508 struct string_list *branches, *skipped;
509 struct known_remotes *keep;
512 static int add_branch_for_removal(const char *refname,
513 const unsigned char *sha1, int flags, void *cb_data)
515 struct branches_for_remote *branches = cb_data;
516 struct refspec refspec;
517 struct string_list_item *item;
518 struct known_remote *kr;
520 memset(&refspec, 0, sizeof(refspec));
521 refspec.dst = (char *)refname;
522 if (remote_find_tracking(branches->remote, &refspec))
525 /* don't delete a branch if another remote also uses it */
526 for (kr = branches->keep->list; kr; kr = kr->next) {
527 memset(&refspec, 0, sizeof(refspec));
528 refspec.dst = (char *)refname;
529 if (!remote_find_tracking(kr->remote, &refspec))
533 /* don't delete non-remote-tracking refs */
534 if (prefixcmp(refname, "refs/remotes/")) {
535 /* advise user how to delete local branches */
536 if (!prefixcmp(refname, "refs/heads/"))
537 string_list_append(branches->skipped,
538 abbrev_branch(refname));
539 /* silently skip over other non-remote refs */
543 /* make sure that symrefs are deleted */
544 if (flags & REF_ISSYMREF)
545 return unlink(git_path("%s", refname));
547 item = string_list_append(branches->branches, refname);
548 item->util = xmalloc(20);
549 hashcpy(item->util, sha1);
557 struct string_list *remote_branches;
560 static int read_remote_branches(const char *refname,
561 const unsigned char *sha1, int flags, void *cb_data)
563 struct rename_info *rename = cb_data;
564 struct strbuf buf = STRBUF_INIT;
565 struct string_list_item *item;
567 unsigned char orig_sha1[20];
570 strbuf_addf(&buf, "refs/remotes/%s/", rename->old);
571 if (!prefixcmp(refname, buf.buf)) {
572 item = string_list_append(rename->remote_branches, xstrdup(refname));
573 symref = resolve_ref_unsafe(refname, orig_sha1, 1, &flag);
574 if (flag & REF_ISSYMREF)
575 item->util = xstrdup(symref);
583 static int migrate_file(struct remote *remote)
585 struct strbuf buf = STRBUF_INIT;
589 strbuf_addf(&buf, "remote.%s.url", remote->name);
590 for (i = 0; i < remote->url_nr; i++)
591 if (git_config_set_multivar(buf.buf, remote->url[i], "^$", 0))
592 return error(_("Could not append '%s' to '%s'"),
593 remote->url[i], buf.buf);
595 strbuf_addf(&buf, "remote.%s.push", remote->name);
596 for (i = 0; i < remote->push_refspec_nr; i++)
597 if (git_config_set_multivar(buf.buf, remote->push_refspec[i], "^$", 0))
598 return error(_("Could not append '%s' to '%s'"),
599 remote->push_refspec[i], buf.buf);
601 strbuf_addf(&buf, "remote.%s.fetch", remote->name);
602 for (i = 0; i < remote->fetch_refspec_nr; i++)
603 if (git_config_set_multivar(buf.buf, remote->fetch_refspec[i], "^$", 0))
604 return error(_("Could not append '%s' to '%s'"),
605 remote->fetch_refspec[i], buf.buf);
606 if (remote->origin == REMOTE_REMOTES)
607 path = git_path("remotes/%s", remote->name);
608 else if (remote->origin == REMOTE_BRANCHES)
609 path = git_path("branches/%s", remote->name);
611 unlink_or_warn(path);
615 static int mv(int argc, const char **argv)
617 struct option options[] = {
620 struct remote *oldremote, *newremote;
621 struct strbuf buf = STRBUF_INIT, buf2 = STRBUF_INIT, buf3 = STRBUF_INIT,
622 old_remote_context = STRBUF_INIT;
623 struct string_list remote_branches = STRING_LIST_INIT_NODUP;
624 struct rename_info rename;
625 int i, refspec_updated = 0;
628 usage_with_options(builtin_remote_rename_usage, options);
630 rename.old = argv[1];
631 rename.new = argv[2];
632 rename.remote_branches = &remote_branches;
634 oldremote = remote_get(rename.old);
636 die(_("No such remote: %s"), rename.old);
638 if (!strcmp(rename.old, rename.new) && oldremote->origin != REMOTE_CONFIG)
639 return migrate_file(oldremote);
641 newremote = remote_get(rename.new);
642 if (newremote && (newremote->url_nr > 1 || newremote->fetch_refspec_nr))
643 die(_("remote %s already exists."), rename.new);
645 strbuf_addf(&buf, "refs/heads/test:refs/remotes/%s/test", rename.new);
646 if (!valid_fetch_refspec(buf.buf))
647 die(_("'%s' is not a valid remote name"), rename.new);
650 strbuf_addf(&buf, "remote.%s", rename.old);
651 strbuf_addf(&buf2, "remote.%s", rename.new);
652 if (git_config_rename_section(buf.buf, buf2.buf) < 1)
653 return error(_("Could not rename config section '%s' to '%s'"),
657 strbuf_addf(&buf, "remote.%s.fetch", rename.new);
658 if (git_config_set_multivar(buf.buf, NULL, NULL, 1))
659 return error(_("Could not remove config section '%s'"), buf.buf);
660 strbuf_addf(&old_remote_context, ":refs/remotes/%s/", rename.old);
661 for (i = 0; i < oldremote->fetch_refspec_nr; i++) {
665 strbuf_addstr(&buf2, oldremote->fetch_refspec[i]);
666 ptr = strstr(buf2.buf, old_remote_context.buf);
670 ptr-buf2.buf + strlen(":refs/remotes/"),
671 strlen(rename.old), rename.new,
674 warning(_("Not updating non-default fetch refspec\n"
676 "\tPlease update the configuration manually if necessary."),
679 if (git_config_set_multivar(buf.buf, buf2.buf, "^$", 0))
680 return error(_("Could not append '%s'"), buf.buf);
684 for (i = 0; i < branch_list.nr; i++) {
685 struct string_list_item *item = branch_list.items + i;
686 struct branch_info *info = item->util;
687 if (info->remote_name && !strcmp(info->remote_name, rename.old)) {
689 strbuf_addf(&buf, "branch.%s.remote", item->string);
690 if (git_config_set(buf.buf, rename.new)) {
691 return error(_("Could not set '%s'"), buf.buf);
696 if (!refspec_updated)
700 * First remove symrefs, then rename the rest, finally create
703 for_each_ref(read_remote_branches, &rename);
704 for (i = 0; i < remote_branches.nr; i++) {
705 struct string_list_item *item = remote_branches.items + i;
707 unsigned char sha1[20];
709 read_ref_full(item->string, sha1, 1, &flag);
710 if (!(flag & REF_ISSYMREF))
712 if (delete_ref(item->string, NULL, REF_NODEREF))
713 die(_("deleting '%s' failed"), item->string);
715 for (i = 0; i < remote_branches.nr; i++) {
716 struct string_list_item *item = remote_branches.items + i;
721 strbuf_addstr(&buf, item->string);
722 strbuf_splice(&buf, strlen("refs/remotes/"), strlen(rename.old),
723 rename.new, strlen(rename.new));
725 strbuf_addf(&buf2, "remote: renamed %s to %s",
726 item->string, buf.buf);
727 if (rename_ref(item->string, buf.buf, buf2.buf))
728 die(_("renaming '%s' failed"), item->string);
730 for (i = 0; i < remote_branches.nr; i++) {
731 struct string_list_item *item = remote_branches.items + i;
736 strbuf_addstr(&buf, item->string);
737 strbuf_splice(&buf, strlen("refs/remotes/"), strlen(rename.old),
738 rename.new, strlen(rename.new));
740 strbuf_addstr(&buf2, item->util);
741 strbuf_splice(&buf2, strlen("refs/remotes/"), strlen(rename.old),
742 rename.new, strlen(rename.new));
744 strbuf_addf(&buf3, "remote: renamed %s to %s",
745 item->string, buf.buf);
746 if (create_symref(buf.buf, buf2.buf, buf3.buf))
747 die(_("creating '%s' failed"), buf.buf);
752 static int remove_branches(struct string_list *branches)
755 for (i = 0; i < branches->nr; i++) {
756 struct string_list_item *item = branches->items + i;
757 const char *refname = item->string;
758 unsigned char *sha1 = item->util;
760 if (delete_ref(refname, sha1, 0))
761 result |= error(_("Could not remove branch %s"), refname);
766 static int rm(int argc, const char **argv)
768 struct option options[] = {
771 struct remote *remote;
772 struct strbuf buf = STRBUF_INIT;
773 struct known_remotes known_remotes = { NULL, NULL };
774 struct string_list branches = STRING_LIST_INIT_DUP;
775 struct string_list skipped = STRING_LIST_INIT_DUP;
776 struct branches_for_remote cb_data;
779 memset(&cb_data, 0, sizeof(cb_data));
780 cb_data.branches = &branches;
781 cb_data.skipped = &skipped;
782 cb_data.keep = &known_remotes;
785 usage_with_options(builtin_remote_rm_usage, options);
787 remote = remote_get(argv[1]);
789 die(_("No such remote: %s"), argv[1]);
791 known_remotes.to_delete = remote;
792 for_each_remote(add_known_remote, &known_remotes);
794 strbuf_addf(&buf, "remote.%s", remote->name);
795 if (git_config_rename_section(buf.buf, NULL) < 1)
796 return error(_("Could not remove config section '%s'"), buf.buf);
799 for (i = 0; i < branch_list.nr; i++) {
800 struct string_list_item *item = branch_list.items + i;
801 struct branch_info *info = item->util;
802 if (info->remote_name && !strcmp(info->remote_name, remote->name)) {
803 const char *keys[] = { "remote", "merge", NULL }, **k;
804 for (k = keys; *k; k++) {
806 strbuf_addf(&buf, "branch.%s.%s",
808 if (git_config_set(buf.buf, NULL)) {
809 strbuf_release(&buf);
817 * We cannot just pass a function to for_each_ref() which deletes
818 * the branches one by one, since for_each_ref() relies on cached
819 * refs, which are invalidated when deleting a branch.
821 cb_data.remote = remote;
822 result = for_each_ref(add_branch_for_removal, &cb_data);
823 strbuf_release(&buf);
826 result = remove_branches(&branches);
827 string_list_clear(&branches, 1);
831 Q_("Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
832 "to delete it, use:",
833 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
834 "to delete them, use:",
836 for (i = 0; i < skipped.nr; i++)
837 fprintf(stderr, " git branch -d %s\n",
838 skipped.items[i].string);
840 string_list_clear(&skipped, 0);
845 static void clear_push_info(void *util, const char *string)
847 struct push_info *info = util;
852 static void free_remote_ref_states(struct ref_states *states)
854 string_list_clear(&states->new, 0);
855 string_list_clear(&states->stale, 1);
856 string_list_clear(&states->tracked, 0);
857 string_list_clear(&states->heads, 0);
858 string_list_clear_func(&states->push, clear_push_info);
861 static int append_ref_to_tracked_list(const char *refname,
862 const unsigned char *sha1, int flags, void *cb_data)
864 struct ref_states *states = cb_data;
865 struct refspec refspec;
867 if (flags & REF_ISSYMREF)
870 memset(&refspec, 0, sizeof(refspec));
871 refspec.dst = (char *)refname;
872 if (!remote_find_tracking(states->remote, &refspec))
873 string_list_append(&states->tracked, abbrev_branch(refspec.src));
878 static int get_remote_ref_states(const char *name,
879 struct ref_states *states,
882 struct transport *transport;
883 const struct ref *remote_refs;
885 states->remote = remote_get(name);
887 return error(_("No such remote: %s"), name);
892 transport = transport_get(states->remote, states->remote->url_nr > 0 ?
893 states->remote->url[0] : NULL);
894 remote_refs = transport_get_remote_refs(transport);
895 transport_disconnect(transport);
898 if (query & GET_REF_STATES)
899 get_ref_states(remote_refs, states);
900 if (query & GET_HEAD_NAMES)
901 get_head_names(remote_refs, states);
902 if (query & GET_PUSH_REF_STATES)
903 get_push_ref_states(remote_refs, states);
905 for_each_ref(append_ref_to_tracked_list, states);
906 sort_string_list(&states->tracked);
907 get_push_ref_states_noquery(states);
914 struct string_list *list;
915 struct ref_states *states;
920 static int add_remote_to_show_info(struct string_list_item *item, void *cb_data)
922 struct show_info *info = cb_data;
923 int n = strlen(item->string);
926 string_list_insert(info->list, item->string);
930 static int show_remote_info_item(struct string_list_item *item, void *cb_data)
932 struct show_info *info = cb_data;
933 struct ref_states *states = info->states;
934 const char *name = item->string;
936 if (states->queried) {
937 const char *fmt = "%s";
938 const char *arg = "";
939 if (string_list_has_string(&states->new, name)) {
940 fmt = _(" new (next fetch will store in remotes/%s)");
941 arg = states->remote->name;
942 } else if (string_list_has_string(&states->tracked, name))
944 else if (string_list_has_string(&states->stale, name))
945 arg = _(" stale (use 'git remote prune' to remove)");
948 printf(" %-*s", info->width, name);
952 printf(" %s\n", name);
957 static int add_local_to_show_info(struct string_list_item *branch_item, void *cb_data)
959 struct show_info *show_info = cb_data;
960 struct ref_states *states = show_info->states;
961 struct branch_info *branch_info = branch_item->util;
962 struct string_list_item *item;
965 if (!branch_info->merge.nr || !branch_info->remote_name ||
966 strcmp(states->remote->name, branch_info->remote_name))
968 if ((n = strlen(branch_item->string)) > show_info->width)
969 show_info->width = n;
970 if (branch_info->rebase)
971 show_info->any_rebase = 1;
973 item = string_list_insert(show_info->list, branch_item->string);
974 item->util = branch_info;
979 static int show_local_info_item(struct string_list_item *item, void *cb_data)
981 struct show_info *show_info = cb_data;
982 struct branch_info *branch_info = item->util;
983 struct string_list *merge = &branch_info->merge;
987 if (branch_info->rebase && branch_info->merge.nr > 1) {
988 error(_("invalid branch.%s.merge; cannot rebase onto > 1 branch"),
993 printf(" %-*s ", show_info->width, item->string);
994 if (branch_info->rebase) {
995 printf_ln(_("rebases onto remote %s"), merge->items[0].string);
997 } else if (show_info->any_rebase) {
998 printf_ln(_(" merges with remote %s"), merge->items[0].string);
999 also = _(" and with remote");
1001 printf_ln(_("merges with remote %s"), merge->items[0].string);
1002 also = _(" and with remote");
1004 for (i = 1; i < merge->nr; i++)
1005 printf(" %-*s %s %s\n", show_info->width, "", also,
1006 merge->items[i].string);
1011 static int add_push_to_show_info(struct string_list_item *push_item, void *cb_data)
1013 struct show_info *show_info = cb_data;
1014 struct push_info *push_info = push_item->util;
1015 struct string_list_item *item;
1017 if ((n = strlen(push_item->string)) > show_info->width)
1018 show_info->width = n;
1019 if ((n = strlen(push_info->dest)) > show_info->width2)
1020 show_info->width2 = n;
1021 item = string_list_append(show_info->list, push_item->string);
1022 item->util = push_item->util;
1027 * Sorting comparison for a string list that has push_info
1028 * structs in its util field
1030 static int cmp_string_with_push(const void *va, const void *vb)
1032 const struct string_list_item *a = va;
1033 const struct string_list_item *b = vb;
1034 const struct push_info *a_push = a->util;
1035 const struct push_info *b_push = b->util;
1036 int cmp = strcmp(a->string, b->string);
1037 return cmp ? cmp : strcmp(a_push->dest, b_push->dest);
1040 static int show_push_info_item(struct string_list_item *item, void *cb_data)
1042 struct show_info *show_info = cb_data;
1043 struct push_info *push_info = item->util;
1044 const char *src = item->string, *status = NULL;
1046 switch (push_info->status) {
1047 case PUSH_STATUS_CREATE:
1048 status = _("create");
1050 case PUSH_STATUS_DELETE:
1051 status = _("delete");
1054 case PUSH_STATUS_UPTODATE:
1055 status = _("up to date");
1057 case PUSH_STATUS_FASTFORWARD:
1058 status = _("fast-forwardable");
1060 case PUSH_STATUS_OUTOFDATE:
1061 status = _("local out of date");
1063 case PUSH_STATUS_NOTQUERIED:
1067 if (push_info->forced)
1068 printf_ln(_(" %-*s forces to %-*s (%s)"), show_info->width, src,
1069 show_info->width2, push_info->dest, status);
1071 printf_ln(_(" %-*s pushes to %-*s (%s)"), show_info->width, src,
1072 show_info->width2, push_info->dest, status);
1074 if (push_info->forced)
1075 printf_ln(_(" %-*s forces to %s"), show_info->width, src,
1078 printf_ln(_(" %-*s pushes to %s"), show_info->width, src,
1084 static int get_one_entry(struct remote *remote, void *priv)
1086 struct string_list *list = priv;
1087 struct strbuf url_buf = STRBUF_INIT;
1091 if (remote->url_nr > 0) {
1092 strbuf_addf(&url_buf, "%s (fetch)", remote->url[0]);
1093 string_list_append(list, remote->name)->util =
1094 strbuf_detach(&url_buf, NULL);
1096 string_list_append(list, remote->name)->util = NULL;
1097 if (remote->pushurl_nr) {
1098 url = remote->pushurl;
1099 url_nr = remote->pushurl_nr;
1102 url_nr = remote->url_nr;
1104 for (i = 0; i < url_nr; i++)
1106 strbuf_addf(&url_buf, "%s (push)", url[i]);
1107 string_list_append(list, remote->name)->util =
1108 strbuf_detach(&url_buf, NULL);
1114 static int show_all(void)
1116 struct string_list list = STRING_LIST_INIT_NODUP;
1119 list.strdup_strings = 1;
1120 result = for_each_remote(get_one_entry, &list);
1125 sort_string_list(&list);
1126 for (i = 0; i < list.nr; i++) {
1127 struct string_list_item *item = list.items + i;
1129 printf("%s\t%s\n", item->string,
1130 item->util ? (const char *)item->util : "");
1132 if (i && !strcmp((item - 1)->string, item->string))
1134 printf("%s\n", item->string);
1138 string_list_clear(&list, 1);
1142 static int show(int argc, const char **argv)
1144 int no_query = 0, result = 0, query_flag = 0;
1145 struct option options[] = {
1146 OPT_BOOL('n', NULL, &no_query, N_("do not query remotes")),
1149 struct ref_states states;
1150 struct string_list info_list = STRING_LIST_INIT_NODUP;
1151 struct show_info info;
1153 argc = parse_options(argc, argv, NULL, options, builtin_remote_show_usage,
1160 query_flag = (GET_REF_STATES | GET_HEAD_NAMES | GET_PUSH_REF_STATES);
1162 memset(&states, 0, sizeof(states));
1163 memset(&info, 0, sizeof(info));
1164 info.states = &states;
1165 info.list = &info_list;
1166 for (; argc; argc--, argv++) {
1171 get_remote_ref_states(*argv, &states, query_flag);
1173 printf_ln(_("* remote %s"), *argv);
1174 printf_ln(_(" Fetch URL: %s"), states.remote->url_nr > 0 ?
1175 states.remote->url[0] : _("(no URL)"));
1176 if (states.remote->pushurl_nr) {
1177 url = states.remote->pushurl;
1178 url_nr = states.remote->pushurl_nr;
1180 url = states.remote->url;
1181 url_nr = states.remote->url_nr;
1183 for (i = 0; i < url_nr; i++)
1184 printf_ln(_(" Push URL: %s"), url[i]);
1186 printf_ln(_(" Push URL: %s"), "(no URL)");
1188 printf_ln(_(" HEAD branch: %s"), "(not queried)");
1189 else if (!states.heads.nr)
1190 printf_ln(_(" HEAD branch: %s"), "(unknown)");
1191 else if (states.heads.nr == 1)
1192 printf_ln(_(" HEAD branch: %s"), states.heads.items[0].string);
1194 printf(_(" HEAD branch (remote HEAD is ambiguous,"
1195 " may be one of the following):\n"));
1196 for (i = 0; i < states.heads.nr; i++)
1197 printf(" %s\n", states.heads.items[i].string);
1200 /* remote branch info */
1202 for_each_string_list(&states.new, add_remote_to_show_info, &info);
1203 for_each_string_list(&states.tracked, add_remote_to_show_info, &info);
1204 for_each_string_list(&states.stale, add_remote_to_show_info, &info);
1206 printf_ln(Q_(" Remote branch:%s",
1207 " Remote branches:%s",
1209 no_query ? _(" (status not queried)") : "");
1210 for_each_string_list(info.list, show_remote_info_item, &info);
1211 string_list_clear(info.list, 0);
1215 info.any_rebase = 0;
1216 for_each_string_list(&branch_list, add_local_to_show_info, &info);
1218 printf_ln(Q_(" Local branch configured for 'git pull':",
1219 " Local branches configured for 'git pull':",
1221 for_each_string_list(info.list, show_local_info_item, &info);
1222 string_list_clear(info.list, 0);
1225 if (states.remote->mirror)
1226 printf_ln(_(" Local refs will be mirrored by 'git push'"));
1228 info.width = info.width2 = 0;
1229 for_each_string_list(&states.push, add_push_to_show_info, &info);
1230 qsort(info.list->items, info.list->nr,
1231 sizeof(*info.list->items), cmp_string_with_push);
1233 printf_ln(Q_(" Local ref configured for 'git push'%s:",
1234 " Local refs configured for 'git push'%s:",
1236 no_query ? _(" (status not queried)") : "");
1237 for_each_string_list(info.list, show_push_info_item, &info);
1238 string_list_clear(info.list, 0);
1240 free_remote_ref_states(&states);
1246 static int set_head(int argc, const char **argv)
1248 int i, opt_a = 0, opt_d = 0, result = 0;
1249 struct strbuf buf = STRBUF_INIT, buf2 = STRBUF_INIT;
1250 char *head_name = NULL;
1252 struct option options[] = {
1253 OPT_BOOL('a', "auto", &opt_a,
1254 N_("set refs/remotes/<name>/HEAD according to remote")),
1255 OPT_BOOL('d', "delete", &opt_d,
1256 N_("delete refs/remotes/<name>/HEAD")),
1259 argc = parse_options(argc, argv, NULL, options, builtin_remote_sethead_usage,
1262 strbuf_addf(&buf, "refs/remotes/%s/HEAD", argv[0]);
1264 if (!opt_a && !opt_d && argc == 2) {
1265 head_name = xstrdup(argv[1]);
1266 } else if (opt_a && !opt_d && argc == 1) {
1267 struct ref_states states;
1268 memset(&states, 0, sizeof(states));
1269 get_remote_ref_states(argv[0], &states, GET_HEAD_NAMES);
1270 if (!states.heads.nr)
1271 result |= error(_("Cannot determine remote HEAD"));
1272 else if (states.heads.nr > 1) {
1273 result |= error(_("Multiple remote HEAD branches. "
1274 "Please choose one explicitly with:"));
1275 for (i = 0; i < states.heads.nr; i++)
1276 fprintf(stderr, " git remote set-head %s %s\n",
1277 argv[0], states.heads.items[i].string);
1279 head_name = xstrdup(states.heads.items[0].string);
1280 free_remote_ref_states(&states);
1281 } else if (opt_d && !opt_a && argc == 1) {
1282 if (delete_ref(buf.buf, NULL, REF_NODEREF))
1283 result |= error(_("Could not delete %s"), buf.buf);
1285 usage_with_options(builtin_remote_sethead_usage, options);
1288 strbuf_addf(&buf2, "refs/remotes/%s/%s", argv[0], head_name);
1289 /* make sure it's valid */
1290 if (!ref_exists(buf2.buf))
1291 result |= error(_("Not a valid ref: %s"), buf2.buf);
1292 else if (create_symref(buf.buf, buf2.buf, "remote set-head"))
1293 result |= error(_("Could not setup %s"), buf.buf);
1295 printf("%s/HEAD set to %s\n", argv[0], head_name);
1299 strbuf_release(&buf);
1300 strbuf_release(&buf2);
1304 static int prune_remote(const char *remote, int dry_run)
1307 struct ref_states states;
1308 const char *dangling_msg = dry_run
1309 ? _(" %s will become dangling!")
1310 : _(" %s has become dangling!");
1312 memset(&states, 0, sizeof(states));
1313 get_remote_ref_states(remote, &states, GET_REF_STATES);
1315 if (states.stale.nr) {
1316 printf_ln(_("Pruning %s"), remote);
1317 printf_ln(_("URL: %s"),
1318 states.remote->url_nr
1319 ? states.remote->url[0]
1323 for (i = 0; i < states.stale.nr; i++) {
1324 const char *refname = states.stale.items[i].util;
1327 result |= delete_ref(refname, NULL, 0);
1330 printf_ln(_(" * [would prune] %s"),
1331 abbrev_ref(refname, "refs/remotes/"));
1333 printf_ln(_(" * [pruned] %s"),
1334 abbrev_ref(refname, "refs/remotes/"));
1335 warn_dangling_symref(stdout, dangling_msg, refname);
1338 free_remote_ref_states(&states);
1342 static int prune(int argc, const char **argv)
1344 int dry_run = 0, result = 0;
1345 struct option options[] = {
1346 OPT__DRY_RUN(&dry_run, N_("dry run")),
1350 argc = parse_options(argc, argv, NULL, options, builtin_remote_prune_usage,
1354 usage_with_options(builtin_remote_prune_usage, options);
1356 for (; argc; argc--, argv++)
1357 result |= prune_remote(*argv, dry_run);
1362 static int get_remote_default(const char *key, const char *value, void *priv)
1364 if (strcmp(key, "remotes.default") == 0) {
1371 static int update(int argc, const char **argv)
1374 struct option options[] = {
1375 OPT_BOOL('p', "prune", &prune,
1376 N_("prune remotes after fetching")),
1379 const char **fetch_argv;
1381 int default_defined = 0;
1383 fetch_argv = xmalloc(sizeof(char *) * (argc+5));
1385 argc = parse_options(argc, argv, NULL, options, builtin_remote_update_usage,
1386 PARSE_OPT_KEEP_ARGV0);
1388 fetch_argv[fetch_argc++] = "fetch";
1391 fetch_argv[fetch_argc++] = "--prune";
1393 fetch_argv[fetch_argc++] = "-v";
1394 fetch_argv[fetch_argc++] = "--multiple";
1396 fetch_argv[fetch_argc++] = "default";
1397 for (i = 1; i < argc; i++)
1398 fetch_argv[fetch_argc++] = argv[i];
1400 if (strcmp(fetch_argv[fetch_argc-1], "default") == 0) {
1401 git_config(get_remote_default, &default_defined);
1402 if (!default_defined)
1403 fetch_argv[fetch_argc-1] = "--all";
1406 fetch_argv[fetch_argc] = NULL;
1408 return run_command_v_opt(fetch_argv, RUN_GIT_CMD);
1411 static int remove_all_fetch_refspecs(const char *remote, const char *key)
1413 return git_config_set_multivar(key, NULL, NULL, 1);
1416 static int add_branches(struct remote *remote, const char **branches,
1419 const char *remotename = remote->name;
1420 int mirror = remote->mirror;
1421 struct strbuf refspec = STRBUF_INIT;
1423 for (; *branches; branches++)
1424 if (add_branch(key, *branches, remotename, mirror, &refspec)) {
1425 strbuf_release(&refspec);
1429 strbuf_release(&refspec);
1433 static int set_remote_branches(const char *remotename, const char **branches,
1436 struct strbuf key = STRBUF_INIT;
1437 struct remote *remote;
1439 strbuf_addf(&key, "remote.%s.fetch", remotename);
1441 if (!remote_is_configured(remotename))
1442 die(_("No such remote '%s'"), remotename);
1443 remote = remote_get(remotename);
1445 if (!add_mode && remove_all_fetch_refspecs(remotename, key.buf)) {
1446 strbuf_release(&key);
1449 if (add_branches(remote, branches, key.buf)) {
1450 strbuf_release(&key);
1454 strbuf_release(&key);
1458 static int set_branches(int argc, const char **argv)
1461 struct option options[] = {
1462 OPT_BOOL('\0', "add", &add_mode, N_("add branch")),
1466 argc = parse_options(argc, argv, NULL, options,
1467 builtin_remote_setbranches_usage, 0);
1469 error(_("no remote specified"));
1470 usage_with_options(builtin_remote_setbranches_usage, options);
1474 return set_remote_branches(argv[0], argv + 1, add_mode);
1477 static int set_url(int argc, const char **argv)
1479 int i, push_mode = 0, add_mode = 0, delete_mode = 0;
1480 int matches = 0, negative_matches = 0;
1481 const char *remotename = NULL;
1482 const char *newurl = NULL;
1483 const char *oldurl = NULL;
1484 struct remote *remote;
1486 const char **urlset;
1488 struct strbuf name_buf = STRBUF_INIT;
1489 struct option options[] = {
1490 OPT_BOOL('\0', "push", &push_mode,
1491 N_("manipulate push URLs")),
1492 OPT_BOOL('\0', "add", &add_mode,
1494 OPT_BOOL('\0', "delete", &delete_mode,
1498 argc = parse_options(argc, argv, NULL, options, builtin_remote_seturl_usage,
1499 PARSE_OPT_KEEP_ARGV0);
1501 if (add_mode && delete_mode)
1502 die(_("--add --delete doesn't make sense"));
1504 if (argc < 3 || argc > 4 || ((add_mode || delete_mode) && argc != 3))
1505 usage_with_options(builtin_remote_seturl_usage, options);
1507 remotename = argv[1];
1515 if (!remote_is_configured(remotename))
1516 die(_("No such remote '%s'"), remotename);
1517 remote = remote_get(remotename);
1520 strbuf_addf(&name_buf, "remote.%s.pushurl", remotename);
1521 urlset = remote->pushurl;
1522 urlset_nr = remote->pushurl_nr;
1524 strbuf_addf(&name_buf, "remote.%s.url", remotename);
1525 urlset = remote->url;
1526 urlset_nr = remote->url_nr;
1529 /* Special cases that add new entry. */
1530 if ((!oldurl && !delete_mode) || add_mode) {
1532 git_config_set_multivar(name_buf.buf, newurl,
1535 git_config_set(name_buf.buf, newurl);
1536 strbuf_release(&name_buf);
1540 /* Old URL specified. Demand that one matches. */
1541 if (regcomp(&old_regex, oldurl, REG_EXTENDED))
1542 die(_("Invalid old URL pattern: %s"), oldurl);
1544 for (i = 0; i < urlset_nr; i++)
1545 if (!regexec(&old_regex, urlset[i], 0, NULL, 0))
1549 if (!delete_mode && !matches)
1550 die(_("No such URL found: %s"), oldurl);
1551 if (delete_mode && !negative_matches && !push_mode)
1552 die(_("Will not delete all non-push URLs"));
1554 regfree(&old_regex);
1557 git_config_set_multivar(name_buf.buf, newurl, oldurl, 0);
1559 git_config_set_multivar(name_buf.buf, NULL, oldurl, 1);
1563 int cmd_remote(int argc, const char **argv, const char *prefix)
1565 struct option options[] = {
1566 OPT__VERBOSE(&verbose, N_("be verbose; must be placed before a subcommand")),
1571 argc = parse_options(argc, argv, prefix, options, builtin_remote_usage,
1572 PARSE_OPT_STOP_AT_NON_OPTION);
1575 result = show_all();
1576 else if (!strcmp(argv[0], "add"))
1577 result = add(argc, argv);
1578 else if (!strcmp(argv[0], "rename"))
1579 result = mv(argc, argv);
1580 else if (!strcmp(argv[0], "rm") || !strcmp(argv[0], "remove"))
1581 result = rm(argc, argv);
1582 else if (!strcmp(argv[0], "set-head"))
1583 result = set_head(argc, argv);
1584 else if (!strcmp(argv[0], "set-branches"))
1585 result = set_branches(argc, argv);
1586 else if (!strcmp(argv[0], "set-url"))
1587 result = set_url(argc, argv);
1588 else if (!strcmp(argv[0], "show"))
1589 result = show(argc, argv);
1590 else if (!strcmp(argv[0], "prune"))
1591 result = prune(argc, argv);
1592 else if (!strcmp(argv[0], "update"))
1593 result = update(argc, argv);
1595 error(_("Unknown subcommand: %s"), argv[0]);
1596 usage_with_options(builtin_remote_usage, options);
1599 return result ? 1 : 0;