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;
270 if (ends_with(key, ".remote")) {
271 name = xstrndup(key, strlen(key) - 7);
273 } else if (ends_with(key, ".merge")) {
274 name = xstrndup(key, strlen(key) - 6);
276 } else if (ends_with(key, ".rebase")) {
277 name = xstrndup(key, strlen(key) - 7);
282 item = string_list_insert(&branch_list, name);
285 item->util = xcalloc(1, sizeof(struct branch_info));
287 if (type == REMOTE) {
288 if (info->remote_name)
289 warning(_("more than one %s"), orig_key);
290 info->remote_name = xstrdup(value);
291 } else if (type == MERGE) {
292 char *space = strchr(value, ' ');
293 value = abbrev_branch(value);
296 merge = xstrndup(value, space - value);
297 string_list_append(&info->merge, merge);
298 value = abbrev_branch(space + 1);
299 space = strchr(value, ' ');
301 string_list_append(&info->merge, xstrdup(value));
303 int v = git_config_maybe_bool(orig_key, value);
306 else if (!strcmp(value, "preserve"))
313 static void read_branches(void)
317 git_config(config_read_branches, NULL);
321 struct remote *remote;
322 struct string_list new, stale, tracked, heads, push;
326 static int get_ref_states(const struct ref *remote_refs, struct ref_states *states)
328 struct ref *fetch_map = NULL, **tail = &fetch_map;
329 struct ref *ref, *stale_refs;
332 for (i = 0; i < states->remote->fetch_refspec_nr; i++)
333 if (get_fetch_map(remote_refs, states->remote->fetch + i, &tail, 1))
334 die(_("Could not get fetch map for refspec %s"),
335 states->remote->fetch_refspec[i]);
337 states->new.strdup_strings = 1;
338 states->tracked.strdup_strings = 1;
339 states->stale.strdup_strings = 1;
340 for (ref = fetch_map; ref; ref = ref->next) {
341 if (!ref->peer_ref || !ref_exists(ref->peer_ref->name))
342 string_list_append(&states->new, abbrev_branch(ref->name));
344 string_list_append(&states->tracked, abbrev_branch(ref->name));
346 stale_refs = get_stale_heads(states->remote->fetch,
347 states->remote->fetch_refspec_nr, fetch_map);
348 for (ref = stale_refs; ref; ref = ref->next) {
349 struct string_list_item *item =
350 string_list_append(&states->stale, abbrev_branch(ref->name));
351 item->util = xstrdup(ref->name);
353 free_refs(stale_refs);
354 free_refs(fetch_map);
356 sort_string_list(&states->new);
357 sort_string_list(&states->tracked);
358 sort_string_list(&states->stale);
367 PUSH_STATUS_CREATE = 0,
369 PUSH_STATUS_UPTODATE,
370 PUSH_STATUS_FASTFORWARD,
371 PUSH_STATUS_OUTOFDATE,
372 PUSH_STATUS_NOTQUERIED
376 static int get_push_ref_states(const struct ref *remote_refs,
377 struct ref_states *states)
379 struct remote *remote = states->remote;
380 struct ref *ref, *local_refs, *push_map;
384 local_refs = get_local_heads();
385 push_map = copy_ref_list(remote_refs);
387 match_push_refs(local_refs, &push_map, remote->push_refspec_nr,
388 remote->push_refspec, MATCH_REFS_NONE);
390 states->push.strdup_strings = 1;
391 for (ref = push_map; ref; ref = ref->next) {
392 struct string_list_item *item;
393 struct push_info *info;
397 hashcpy(ref->new_sha1, ref->peer_ref->new_sha1);
399 item = string_list_append(&states->push,
400 abbrev_branch(ref->peer_ref->name));
401 item->util = xcalloc(1, sizeof(struct push_info));
403 info->forced = ref->force;
404 info->dest = xstrdup(abbrev_branch(ref->name));
406 if (is_null_sha1(ref->new_sha1)) {
407 info->status = PUSH_STATUS_DELETE;
408 } else if (!hashcmp(ref->old_sha1, ref->new_sha1))
409 info->status = PUSH_STATUS_UPTODATE;
410 else if (is_null_sha1(ref->old_sha1))
411 info->status = PUSH_STATUS_CREATE;
412 else if (has_sha1_file(ref->old_sha1) &&
413 ref_newer(ref->new_sha1, ref->old_sha1))
414 info->status = PUSH_STATUS_FASTFORWARD;
416 info->status = PUSH_STATUS_OUTOFDATE;
418 free_refs(local_refs);
423 static int get_push_ref_states_noquery(struct ref_states *states)
426 struct remote *remote = states->remote;
427 struct string_list_item *item;
428 struct push_info *info;
433 states->push.strdup_strings = 1;
434 if (!remote->push_refspec_nr) {
435 item = string_list_append(&states->push, _("(matching)"));
436 info = item->util = xcalloc(1, sizeof(struct push_info));
437 info->status = PUSH_STATUS_NOTQUERIED;
438 info->dest = xstrdup(item->string);
440 for (i = 0; i < remote->push_refspec_nr; i++) {
441 struct refspec *spec = remote->push + i;
443 item = string_list_append(&states->push, _("(matching)"));
444 else if (strlen(spec->src))
445 item = string_list_append(&states->push, spec->src);
447 item = string_list_append(&states->push, _("(delete)"));
449 info = item->util = xcalloc(1, sizeof(struct push_info));
450 info->forced = spec->force;
451 info->status = PUSH_STATUS_NOTQUERIED;
452 info->dest = xstrdup(spec->dst ? spec->dst : item->string);
457 static int get_head_names(const struct ref *remote_refs, struct ref_states *states)
459 struct ref *ref, *matches;
460 struct ref *fetch_map = NULL, **fetch_map_tail = &fetch_map;
461 struct refspec refspec;
465 refspec.src = refspec.dst = "refs/heads/*";
466 states->heads.strdup_strings = 1;
467 get_fetch_map(remote_refs, &refspec, &fetch_map_tail, 0);
468 matches = guess_remote_head(find_ref_by_name(remote_refs, "HEAD"),
470 for (ref = matches; ref; ref = ref->next)
471 string_list_append(&states->heads, abbrev_branch(ref->name));
473 free_refs(fetch_map);
479 struct known_remote {
480 struct known_remote *next;
481 struct remote *remote;
484 struct known_remotes {
485 struct remote *to_delete;
486 struct known_remote *list;
489 static int add_known_remote(struct remote *remote, void *cb_data)
491 struct known_remotes *all = cb_data;
492 struct known_remote *r;
494 if (!strcmp(all->to_delete->name, remote->name))
497 r = xmalloc(sizeof(*r));
504 struct branches_for_remote {
505 struct remote *remote;
506 struct string_list *branches, *skipped;
507 struct known_remotes *keep;
510 static int add_branch_for_removal(const char *refname,
511 const unsigned char *sha1, int flags, void *cb_data)
513 struct branches_for_remote *branches = cb_data;
514 struct refspec refspec;
515 struct string_list_item *item;
516 struct known_remote *kr;
518 memset(&refspec, 0, sizeof(refspec));
519 refspec.dst = (char *)refname;
520 if (remote_find_tracking(branches->remote, &refspec))
523 /* don't delete a branch if another remote also uses it */
524 for (kr = branches->keep->list; kr; kr = kr->next) {
525 memset(&refspec, 0, sizeof(refspec));
526 refspec.dst = (char *)refname;
527 if (!remote_find_tracking(kr->remote, &refspec))
531 /* don't delete non-remote-tracking refs */
532 if (!starts_with(refname, "refs/remotes/")) {
533 /* advise user how to delete local branches */
534 if (starts_with(refname, "refs/heads/"))
535 string_list_append(branches->skipped,
536 abbrev_branch(refname));
537 /* silently skip over other non-remote refs */
541 /* make sure that symrefs are deleted */
542 if (flags & REF_ISSYMREF)
543 return unlink(git_path("%s", refname));
545 item = string_list_append(branches->branches, refname);
546 item->util = xmalloc(20);
547 hashcpy(item->util, sha1);
555 struct string_list *remote_branches;
558 static int read_remote_branches(const char *refname,
559 const unsigned char *sha1, int flags, void *cb_data)
561 struct rename_info *rename = cb_data;
562 struct strbuf buf = STRBUF_INIT;
563 struct string_list_item *item;
565 unsigned char orig_sha1[20];
568 strbuf_addf(&buf, "refs/remotes/%s/", rename->old);
569 if (starts_with(refname, buf.buf)) {
570 item = string_list_append(rename->remote_branches, xstrdup(refname));
571 symref = resolve_ref_unsafe(refname, orig_sha1, 1, &flag);
572 if (flag & REF_ISSYMREF)
573 item->util = xstrdup(symref);
581 static int migrate_file(struct remote *remote)
583 struct strbuf buf = STRBUF_INIT;
587 strbuf_addf(&buf, "remote.%s.url", remote->name);
588 for (i = 0; i < remote->url_nr; i++)
589 if (git_config_set_multivar(buf.buf, remote->url[i], "^$", 0))
590 return error(_("Could not append '%s' to '%s'"),
591 remote->url[i], buf.buf);
593 strbuf_addf(&buf, "remote.%s.push", remote->name);
594 for (i = 0; i < remote->push_refspec_nr; i++)
595 if (git_config_set_multivar(buf.buf, remote->push_refspec[i], "^$", 0))
596 return error(_("Could not append '%s' to '%s'"),
597 remote->push_refspec[i], buf.buf);
599 strbuf_addf(&buf, "remote.%s.fetch", remote->name);
600 for (i = 0; i < remote->fetch_refspec_nr; i++)
601 if (git_config_set_multivar(buf.buf, remote->fetch_refspec[i], "^$", 0))
602 return error(_("Could not append '%s' to '%s'"),
603 remote->fetch_refspec[i], buf.buf);
604 if (remote->origin == REMOTE_REMOTES)
605 path = git_path("remotes/%s", remote->name);
606 else if (remote->origin == REMOTE_BRANCHES)
607 path = git_path("branches/%s", remote->name);
609 unlink_or_warn(path);
613 static int mv(int argc, const char **argv)
615 struct option options[] = {
618 struct remote *oldremote, *newremote;
619 struct strbuf buf = STRBUF_INIT, buf2 = STRBUF_INIT, buf3 = STRBUF_INIT,
620 old_remote_context = STRBUF_INIT;
621 struct string_list remote_branches = STRING_LIST_INIT_NODUP;
622 struct rename_info rename;
623 int i, refspec_updated = 0;
626 usage_with_options(builtin_remote_rename_usage, options);
628 rename.old = argv[1];
629 rename.new = argv[2];
630 rename.remote_branches = &remote_branches;
632 oldremote = remote_get(rename.old);
634 die(_("No such remote: %s"), rename.old);
636 if (!strcmp(rename.old, rename.new) && oldremote->origin != REMOTE_CONFIG)
637 return migrate_file(oldremote);
639 newremote = remote_get(rename.new);
640 if (newremote && (newremote->url_nr > 1 || newremote->fetch_refspec_nr))
641 die(_("remote %s already exists."), rename.new);
643 strbuf_addf(&buf, "refs/heads/test:refs/remotes/%s/test", rename.new);
644 if (!valid_fetch_refspec(buf.buf))
645 die(_("'%s' is not a valid remote name"), rename.new);
648 strbuf_addf(&buf, "remote.%s", rename.old);
649 strbuf_addf(&buf2, "remote.%s", rename.new);
650 if (git_config_rename_section(buf.buf, buf2.buf) < 1)
651 return error(_("Could not rename config section '%s' to '%s'"),
655 strbuf_addf(&buf, "remote.%s.fetch", rename.new);
656 if (git_config_set_multivar(buf.buf, NULL, NULL, 1))
657 return error(_("Could not remove config section '%s'"), buf.buf);
658 strbuf_addf(&old_remote_context, ":refs/remotes/%s/", rename.old);
659 for (i = 0; i < oldremote->fetch_refspec_nr; i++) {
663 strbuf_addstr(&buf2, oldremote->fetch_refspec[i]);
664 ptr = strstr(buf2.buf, old_remote_context.buf);
668 ptr-buf2.buf + strlen(":refs/remotes/"),
669 strlen(rename.old), rename.new,
672 warning(_("Not updating non-default fetch refspec\n"
674 "\tPlease update the configuration manually if necessary."),
677 if (git_config_set_multivar(buf.buf, buf2.buf, "^$", 0))
678 return error(_("Could not append '%s'"), buf.buf);
682 for (i = 0; i < branch_list.nr; i++) {
683 struct string_list_item *item = branch_list.items + i;
684 struct branch_info *info = item->util;
685 if (info->remote_name && !strcmp(info->remote_name, rename.old)) {
687 strbuf_addf(&buf, "branch.%s.remote", item->string);
688 if (git_config_set(buf.buf, rename.new)) {
689 return error(_("Could not set '%s'"), buf.buf);
694 if (!refspec_updated)
698 * First remove symrefs, then rename the rest, finally create
701 for_each_ref(read_remote_branches, &rename);
702 for (i = 0; i < remote_branches.nr; i++) {
703 struct string_list_item *item = remote_branches.items + i;
705 unsigned char sha1[20];
707 read_ref_full(item->string, sha1, 1, &flag);
708 if (!(flag & REF_ISSYMREF))
710 if (delete_ref(item->string, NULL, REF_NODEREF))
711 die(_("deleting '%s' failed"), item->string);
713 for (i = 0; i < remote_branches.nr; i++) {
714 struct string_list_item *item = remote_branches.items + i;
719 strbuf_addstr(&buf, item->string);
720 strbuf_splice(&buf, strlen("refs/remotes/"), strlen(rename.old),
721 rename.new, strlen(rename.new));
723 strbuf_addf(&buf2, "remote: renamed %s to %s",
724 item->string, buf.buf);
725 if (rename_ref(item->string, buf.buf, buf2.buf))
726 die(_("renaming '%s' failed"), item->string);
728 for (i = 0; i < remote_branches.nr; i++) {
729 struct string_list_item *item = remote_branches.items + i;
734 strbuf_addstr(&buf, item->string);
735 strbuf_splice(&buf, strlen("refs/remotes/"), strlen(rename.old),
736 rename.new, strlen(rename.new));
738 strbuf_addstr(&buf2, item->util);
739 strbuf_splice(&buf2, strlen("refs/remotes/"), strlen(rename.old),
740 rename.new, strlen(rename.new));
742 strbuf_addf(&buf3, "remote: renamed %s to %s",
743 item->string, buf.buf);
744 if (create_symref(buf.buf, buf2.buf, buf3.buf))
745 die(_("creating '%s' failed"), buf.buf);
750 static int remove_branches(struct string_list *branches)
752 const char **branch_names;
755 branch_names = xmalloc(branches->nr * sizeof(*branch_names));
756 for (i = 0; i < branches->nr; i++)
757 branch_names[i] = branches->items[i].string;
758 result |= repack_without_refs(branch_names, branches->nr);
761 for (i = 0; i < branches->nr; i++) {
762 struct string_list_item *item = branches->items + i;
763 const char *refname = item->string;
765 if (delete_ref(refname, NULL, 0))
766 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);
801 for (i = 0; i < branch_list.nr; i++) {
802 struct string_list_item *item = branch_list.items + i;
803 struct branch_info *info = item->util;
804 if (info->remote_name && !strcmp(info->remote_name, remote->name)) {
805 const char *keys[] = { "remote", "merge", NULL }, **k;
806 for (k = keys; *k; k++) {
808 strbuf_addf(&buf, "branch.%s.%s",
810 if (git_config_set(buf.buf, NULL)) {
811 strbuf_release(&buf);
819 * We cannot just pass a function to for_each_ref() which deletes
820 * the branches one by one, since for_each_ref() relies on cached
821 * refs, which are invalidated when deleting a branch.
823 cb_data.remote = remote;
824 result = for_each_ref(add_branch_for_removal, &cb_data);
825 strbuf_release(&buf);
828 result = remove_branches(&branches);
829 string_list_clear(&branches, 1);
833 Q_("Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
834 "to delete it, use:",
835 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
836 "to delete them, use:",
838 for (i = 0; i < skipped.nr; i++)
839 fprintf(stderr, " git branch -d %s\n",
840 skipped.items[i].string);
842 string_list_clear(&skipped, 0);
845 strbuf_addf(&buf, "remote.%s", remote->name);
846 if (git_config_rename_section(buf.buf, NULL) < 1)
847 return error(_("Could not remove config section '%s'"), buf.buf);
853 static void clear_push_info(void *util, const char *string)
855 struct push_info *info = util;
860 static void free_remote_ref_states(struct ref_states *states)
862 string_list_clear(&states->new, 0);
863 string_list_clear(&states->stale, 1);
864 string_list_clear(&states->tracked, 0);
865 string_list_clear(&states->heads, 0);
866 string_list_clear_func(&states->push, clear_push_info);
869 static int append_ref_to_tracked_list(const char *refname,
870 const unsigned char *sha1, int flags, void *cb_data)
872 struct ref_states *states = cb_data;
873 struct refspec refspec;
875 if (flags & REF_ISSYMREF)
878 memset(&refspec, 0, sizeof(refspec));
879 refspec.dst = (char *)refname;
880 if (!remote_find_tracking(states->remote, &refspec))
881 string_list_append(&states->tracked, abbrev_branch(refspec.src));
886 static int get_remote_ref_states(const char *name,
887 struct ref_states *states,
890 struct transport *transport;
891 const struct ref *remote_refs;
893 states->remote = remote_get(name);
895 return error(_("No such remote: %s"), name);
900 transport = transport_get(states->remote, states->remote->url_nr > 0 ?
901 states->remote->url[0] : NULL);
902 remote_refs = transport_get_remote_refs(transport);
903 transport_disconnect(transport);
906 if (query & GET_REF_STATES)
907 get_ref_states(remote_refs, states);
908 if (query & GET_HEAD_NAMES)
909 get_head_names(remote_refs, states);
910 if (query & GET_PUSH_REF_STATES)
911 get_push_ref_states(remote_refs, states);
913 for_each_ref(append_ref_to_tracked_list, states);
914 sort_string_list(&states->tracked);
915 get_push_ref_states_noquery(states);
922 struct string_list *list;
923 struct ref_states *states;
928 static int add_remote_to_show_info(struct string_list_item *item, void *cb_data)
930 struct show_info *info = cb_data;
931 int n = strlen(item->string);
934 string_list_insert(info->list, item->string);
938 static int show_remote_info_item(struct string_list_item *item, void *cb_data)
940 struct show_info *info = cb_data;
941 struct ref_states *states = info->states;
942 const char *name = item->string;
944 if (states->queried) {
945 const char *fmt = "%s";
946 const char *arg = "";
947 if (string_list_has_string(&states->new, name)) {
948 fmt = _(" new (next fetch will store in remotes/%s)");
949 arg = states->remote->name;
950 } else if (string_list_has_string(&states->tracked, name))
952 else if (string_list_has_string(&states->stale, name))
953 arg = _(" stale (use 'git remote prune' to remove)");
956 printf(" %-*s", info->width, name);
960 printf(" %s\n", name);
965 static int add_local_to_show_info(struct string_list_item *branch_item, void *cb_data)
967 struct show_info *show_info = cb_data;
968 struct ref_states *states = show_info->states;
969 struct branch_info *branch_info = branch_item->util;
970 struct string_list_item *item;
973 if (!branch_info->merge.nr || !branch_info->remote_name ||
974 strcmp(states->remote->name, branch_info->remote_name))
976 if ((n = strlen(branch_item->string)) > show_info->width)
977 show_info->width = n;
978 if (branch_info->rebase)
979 show_info->any_rebase = 1;
981 item = string_list_insert(show_info->list, branch_item->string);
982 item->util = branch_info;
987 static int show_local_info_item(struct string_list_item *item, void *cb_data)
989 struct show_info *show_info = cb_data;
990 struct branch_info *branch_info = item->util;
991 struct string_list *merge = &branch_info->merge;
995 if (branch_info->rebase && branch_info->merge.nr > 1) {
996 error(_("invalid branch.%s.merge; cannot rebase onto > 1 branch"),
1001 printf(" %-*s ", show_info->width, item->string);
1002 if (branch_info->rebase) {
1003 printf_ln(_("rebases onto remote %s"), merge->items[0].string);
1005 } else if (show_info->any_rebase) {
1006 printf_ln(_(" merges with remote %s"), merge->items[0].string);
1007 also = _(" and with remote");
1009 printf_ln(_("merges with remote %s"), merge->items[0].string);
1010 also = _(" and with remote");
1012 for (i = 1; i < merge->nr; i++)
1013 printf(" %-*s %s %s\n", show_info->width, "", also,
1014 merge->items[i].string);
1019 static int add_push_to_show_info(struct string_list_item *push_item, void *cb_data)
1021 struct show_info *show_info = cb_data;
1022 struct push_info *push_info = push_item->util;
1023 struct string_list_item *item;
1025 if ((n = strlen(push_item->string)) > show_info->width)
1026 show_info->width = n;
1027 if ((n = strlen(push_info->dest)) > show_info->width2)
1028 show_info->width2 = n;
1029 item = string_list_append(show_info->list, push_item->string);
1030 item->util = push_item->util;
1035 * Sorting comparison for a string list that has push_info
1036 * structs in its util field
1038 static int cmp_string_with_push(const void *va, const void *vb)
1040 const struct string_list_item *a = va;
1041 const struct string_list_item *b = vb;
1042 const struct push_info *a_push = a->util;
1043 const struct push_info *b_push = b->util;
1044 int cmp = strcmp(a->string, b->string);
1045 return cmp ? cmp : strcmp(a_push->dest, b_push->dest);
1048 static int show_push_info_item(struct string_list_item *item, void *cb_data)
1050 struct show_info *show_info = cb_data;
1051 struct push_info *push_info = item->util;
1052 const char *src = item->string, *status = NULL;
1054 switch (push_info->status) {
1055 case PUSH_STATUS_CREATE:
1056 status = _("create");
1058 case PUSH_STATUS_DELETE:
1059 status = _("delete");
1062 case PUSH_STATUS_UPTODATE:
1063 status = _("up to date");
1065 case PUSH_STATUS_FASTFORWARD:
1066 status = _("fast-forwardable");
1068 case PUSH_STATUS_OUTOFDATE:
1069 status = _("local out of date");
1071 case PUSH_STATUS_NOTQUERIED:
1075 if (push_info->forced)
1076 printf_ln(_(" %-*s forces to %-*s (%s)"), show_info->width, src,
1077 show_info->width2, push_info->dest, status);
1079 printf_ln(_(" %-*s pushes to %-*s (%s)"), show_info->width, src,
1080 show_info->width2, push_info->dest, status);
1082 if (push_info->forced)
1083 printf_ln(_(" %-*s forces to %s"), show_info->width, src,
1086 printf_ln(_(" %-*s pushes to %s"), show_info->width, src,
1092 static int get_one_entry(struct remote *remote, void *priv)
1094 struct string_list *list = priv;
1095 struct strbuf url_buf = STRBUF_INIT;
1099 if (remote->url_nr > 0) {
1100 strbuf_addf(&url_buf, "%s (fetch)", remote->url[0]);
1101 string_list_append(list, remote->name)->util =
1102 strbuf_detach(&url_buf, NULL);
1104 string_list_append(list, remote->name)->util = NULL;
1105 if (remote->pushurl_nr) {
1106 url = remote->pushurl;
1107 url_nr = remote->pushurl_nr;
1110 url_nr = remote->url_nr;
1112 for (i = 0; i < url_nr; i++)
1114 strbuf_addf(&url_buf, "%s (push)", url[i]);
1115 string_list_append(list, remote->name)->util =
1116 strbuf_detach(&url_buf, NULL);
1122 static int show_all(void)
1124 struct string_list list = STRING_LIST_INIT_NODUP;
1127 list.strdup_strings = 1;
1128 result = for_each_remote(get_one_entry, &list);
1133 sort_string_list(&list);
1134 for (i = 0; i < list.nr; i++) {
1135 struct string_list_item *item = list.items + i;
1137 printf("%s\t%s\n", item->string,
1138 item->util ? (const char *)item->util : "");
1140 if (i && !strcmp((item - 1)->string, item->string))
1142 printf("%s\n", item->string);
1146 string_list_clear(&list, 1);
1150 static int show(int argc, const char **argv)
1152 int no_query = 0, result = 0, query_flag = 0;
1153 struct option options[] = {
1154 OPT_BOOL('n', NULL, &no_query, N_("do not query remotes")),
1157 struct ref_states states;
1158 struct string_list info_list = STRING_LIST_INIT_NODUP;
1159 struct show_info info;
1161 argc = parse_options(argc, argv, NULL, options, builtin_remote_show_usage,
1168 query_flag = (GET_REF_STATES | GET_HEAD_NAMES | GET_PUSH_REF_STATES);
1170 memset(&states, 0, sizeof(states));
1171 memset(&info, 0, sizeof(info));
1172 info.states = &states;
1173 info.list = &info_list;
1174 for (; argc; argc--, argv++) {
1179 get_remote_ref_states(*argv, &states, query_flag);
1181 printf_ln(_("* remote %s"), *argv);
1182 printf_ln(_(" Fetch URL: %s"), states.remote->url_nr > 0 ?
1183 states.remote->url[0] : _("(no URL)"));
1184 if (states.remote->pushurl_nr) {
1185 url = states.remote->pushurl;
1186 url_nr = states.remote->pushurl_nr;
1188 url = states.remote->url;
1189 url_nr = states.remote->url_nr;
1191 for (i = 0; i < url_nr; i++)
1192 printf_ln(_(" Push URL: %s"), url[i]);
1194 printf_ln(_(" Push URL: %s"), "(no URL)");
1196 printf_ln(_(" HEAD branch: %s"), "(not queried)");
1197 else if (!states.heads.nr)
1198 printf_ln(_(" HEAD branch: %s"), "(unknown)");
1199 else if (states.heads.nr == 1)
1200 printf_ln(_(" HEAD branch: %s"), states.heads.items[0].string);
1202 printf(_(" HEAD branch (remote HEAD is ambiguous,"
1203 " may be one of the following):\n"));
1204 for (i = 0; i < states.heads.nr; i++)
1205 printf(" %s\n", states.heads.items[i].string);
1208 /* remote branch info */
1210 for_each_string_list(&states.new, add_remote_to_show_info, &info);
1211 for_each_string_list(&states.tracked, add_remote_to_show_info, &info);
1212 for_each_string_list(&states.stale, add_remote_to_show_info, &info);
1214 printf_ln(Q_(" Remote branch:%s",
1215 " Remote branches:%s",
1217 no_query ? _(" (status not queried)") : "");
1218 for_each_string_list(info.list, show_remote_info_item, &info);
1219 string_list_clear(info.list, 0);
1223 info.any_rebase = 0;
1224 for_each_string_list(&branch_list, add_local_to_show_info, &info);
1226 printf_ln(Q_(" Local branch configured for 'git pull':",
1227 " Local branches configured for 'git pull':",
1229 for_each_string_list(info.list, show_local_info_item, &info);
1230 string_list_clear(info.list, 0);
1233 if (states.remote->mirror)
1234 printf_ln(_(" Local refs will be mirrored by 'git push'"));
1236 info.width = info.width2 = 0;
1237 for_each_string_list(&states.push, add_push_to_show_info, &info);
1238 qsort(info.list->items, info.list->nr,
1239 sizeof(*info.list->items), cmp_string_with_push);
1241 printf_ln(Q_(" Local ref configured for 'git push'%s:",
1242 " Local refs configured for 'git push'%s:",
1244 no_query ? _(" (status not queried)") : "");
1245 for_each_string_list(info.list, show_push_info_item, &info);
1246 string_list_clear(info.list, 0);
1248 free_remote_ref_states(&states);
1254 static int set_head(int argc, const char **argv)
1256 int i, opt_a = 0, opt_d = 0, result = 0;
1257 struct strbuf buf = STRBUF_INIT, buf2 = STRBUF_INIT;
1258 char *head_name = NULL;
1260 struct option options[] = {
1261 OPT_BOOL('a', "auto", &opt_a,
1262 N_("set refs/remotes/<name>/HEAD according to remote")),
1263 OPT_BOOL('d', "delete", &opt_d,
1264 N_("delete refs/remotes/<name>/HEAD")),
1267 argc = parse_options(argc, argv, NULL, options, builtin_remote_sethead_usage,
1270 strbuf_addf(&buf, "refs/remotes/%s/HEAD", argv[0]);
1272 if (!opt_a && !opt_d && argc == 2) {
1273 head_name = xstrdup(argv[1]);
1274 } else if (opt_a && !opt_d && argc == 1) {
1275 struct ref_states states;
1276 memset(&states, 0, sizeof(states));
1277 get_remote_ref_states(argv[0], &states, GET_HEAD_NAMES);
1278 if (!states.heads.nr)
1279 result |= error(_("Cannot determine remote HEAD"));
1280 else if (states.heads.nr > 1) {
1281 result |= error(_("Multiple remote HEAD branches. "
1282 "Please choose one explicitly with:"));
1283 for (i = 0; i < states.heads.nr; i++)
1284 fprintf(stderr, " git remote set-head %s %s\n",
1285 argv[0], states.heads.items[i].string);
1287 head_name = xstrdup(states.heads.items[0].string);
1288 free_remote_ref_states(&states);
1289 } else if (opt_d && !opt_a && argc == 1) {
1290 if (delete_ref(buf.buf, NULL, REF_NODEREF))
1291 result |= error(_("Could not delete %s"), buf.buf);
1293 usage_with_options(builtin_remote_sethead_usage, options);
1296 strbuf_addf(&buf2, "refs/remotes/%s/%s", argv[0], head_name);
1297 /* make sure it's valid */
1298 if (!ref_exists(buf2.buf))
1299 result |= error(_("Not a valid ref: %s"), buf2.buf);
1300 else if (create_symref(buf.buf, buf2.buf, "remote set-head"))
1301 result |= error(_("Could not setup %s"), buf.buf);
1303 printf("%s/HEAD set to %s\n", argv[0], head_name);
1307 strbuf_release(&buf);
1308 strbuf_release(&buf2);
1312 static int prune_remote(const char *remote, int dry_run)
1315 struct ref_states states;
1316 struct string_list delete_refs_list = STRING_LIST_INIT_NODUP;
1317 const char **delete_refs;
1318 const char *dangling_msg = dry_run
1319 ? _(" %s will become dangling!")
1320 : _(" %s has become dangling!");
1322 memset(&states, 0, sizeof(states));
1323 get_remote_ref_states(remote, &states, GET_REF_STATES);
1325 if (states.stale.nr) {
1326 printf_ln(_("Pruning %s"), remote);
1327 printf_ln(_("URL: %s"),
1328 states.remote->url_nr
1329 ? states.remote->url[0]
1332 delete_refs = xmalloc(states.stale.nr * sizeof(*delete_refs));
1333 for (i = 0; i < states.stale.nr; i++)
1334 delete_refs[i] = states.stale.items[i].util;
1336 result |= repack_without_refs(delete_refs, states.stale.nr);
1340 for (i = 0; i < states.stale.nr; i++) {
1341 const char *refname = states.stale.items[i].util;
1343 string_list_insert(&delete_refs_list, refname);
1346 result |= delete_ref(refname, NULL, 0);
1349 printf_ln(_(" * [would prune] %s"),
1350 abbrev_ref(refname, "refs/remotes/"));
1352 printf_ln(_(" * [pruned] %s"),
1353 abbrev_ref(refname, "refs/remotes/"));
1356 warn_dangling_symrefs(stdout, dangling_msg, &delete_refs_list);
1357 string_list_clear(&delete_refs_list, 0);
1359 free_remote_ref_states(&states);
1363 static int prune(int argc, const char **argv)
1365 int dry_run = 0, result = 0;
1366 struct option options[] = {
1367 OPT__DRY_RUN(&dry_run, N_("dry run")),
1371 argc = parse_options(argc, argv, NULL, options, builtin_remote_prune_usage,
1375 usage_with_options(builtin_remote_prune_usage, options);
1377 for (; argc; argc--, argv++)
1378 result |= prune_remote(*argv, dry_run);
1383 static int get_remote_default(const char *key, const char *value, void *priv)
1385 if (strcmp(key, "remotes.default") == 0) {
1392 static int update(int argc, const char **argv)
1395 struct option options[] = {
1396 OPT_BOOL('p', "prune", &prune,
1397 N_("prune remotes after fetching")),
1400 struct argv_array fetch_argv = ARGV_ARRAY_INIT;
1401 int default_defined = 0;
1404 argc = parse_options(argc, argv, NULL, options, builtin_remote_update_usage,
1405 PARSE_OPT_KEEP_ARGV0);
1407 argv_array_push(&fetch_argv, "fetch");
1410 argv_array_push(&fetch_argv, prune ? "--prune" : "--no-prune");
1412 argv_array_push(&fetch_argv, "-v");
1413 argv_array_push(&fetch_argv, "--multiple");
1415 argv_array_push(&fetch_argv, "default");
1416 for (i = 1; i < argc; i++)
1417 argv_array_push(&fetch_argv, argv[i]);
1419 if (strcmp(fetch_argv.argv[fetch_argv.argc-1], "default") == 0) {
1420 git_config(get_remote_default, &default_defined);
1421 if (!default_defined) {
1422 argv_array_pop(&fetch_argv);
1423 argv_array_push(&fetch_argv, "--all");
1427 retval = run_command_v_opt(fetch_argv.argv, RUN_GIT_CMD);
1428 argv_array_clear(&fetch_argv);
1432 static int remove_all_fetch_refspecs(const char *remote, const char *key)
1434 return git_config_set_multivar(key, NULL, NULL, 1);
1437 static int add_branches(struct remote *remote, const char **branches,
1440 const char *remotename = remote->name;
1441 int mirror = remote->mirror;
1442 struct strbuf refspec = STRBUF_INIT;
1444 for (; *branches; branches++)
1445 if (add_branch(key, *branches, remotename, mirror, &refspec)) {
1446 strbuf_release(&refspec);
1450 strbuf_release(&refspec);
1454 static int set_remote_branches(const char *remotename, const char **branches,
1457 struct strbuf key = STRBUF_INIT;
1458 struct remote *remote;
1460 strbuf_addf(&key, "remote.%s.fetch", remotename);
1462 if (!remote_is_configured(remotename))
1463 die(_("No such remote '%s'"), remotename);
1464 remote = remote_get(remotename);
1466 if (!add_mode && remove_all_fetch_refspecs(remotename, key.buf)) {
1467 strbuf_release(&key);
1470 if (add_branches(remote, branches, key.buf)) {
1471 strbuf_release(&key);
1475 strbuf_release(&key);
1479 static int set_branches(int argc, const char **argv)
1482 struct option options[] = {
1483 OPT_BOOL('\0', "add", &add_mode, N_("add branch")),
1487 argc = parse_options(argc, argv, NULL, options,
1488 builtin_remote_setbranches_usage, 0);
1490 error(_("no remote specified"));
1491 usage_with_options(builtin_remote_setbranches_usage, options);
1495 return set_remote_branches(argv[0], argv + 1, add_mode);
1498 static int set_url(int argc, const char **argv)
1500 int i, push_mode = 0, add_mode = 0, delete_mode = 0;
1501 int matches = 0, negative_matches = 0;
1502 const char *remotename = NULL;
1503 const char *newurl = NULL;
1504 const char *oldurl = NULL;
1505 struct remote *remote;
1507 const char **urlset;
1509 struct strbuf name_buf = STRBUF_INIT;
1510 struct option options[] = {
1511 OPT_BOOL('\0', "push", &push_mode,
1512 N_("manipulate push URLs")),
1513 OPT_BOOL('\0', "add", &add_mode,
1515 OPT_BOOL('\0', "delete", &delete_mode,
1519 argc = parse_options(argc, argv, NULL, options, builtin_remote_seturl_usage,
1520 PARSE_OPT_KEEP_ARGV0);
1522 if (add_mode && delete_mode)
1523 die(_("--add --delete doesn't make sense"));
1525 if (argc < 3 || argc > 4 || ((add_mode || delete_mode) && argc != 3))
1526 usage_with_options(builtin_remote_seturl_usage, options);
1528 remotename = argv[1];
1536 if (!remote_is_configured(remotename))
1537 die(_("No such remote '%s'"), remotename);
1538 remote = remote_get(remotename);
1541 strbuf_addf(&name_buf, "remote.%s.pushurl", remotename);
1542 urlset = remote->pushurl;
1543 urlset_nr = remote->pushurl_nr;
1545 strbuf_addf(&name_buf, "remote.%s.url", remotename);
1546 urlset = remote->url;
1547 urlset_nr = remote->url_nr;
1550 /* Special cases that add new entry. */
1551 if ((!oldurl && !delete_mode) || add_mode) {
1553 git_config_set_multivar(name_buf.buf, newurl,
1556 git_config_set(name_buf.buf, newurl);
1557 strbuf_release(&name_buf);
1561 /* Old URL specified. Demand that one matches. */
1562 if (regcomp(&old_regex, oldurl, REG_EXTENDED))
1563 die(_("Invalid old URL pattern: %s"), oldurl);
1565 for (i = 0; i < urlset_nr; i++)
1566 if (!regexec(&old_regex, urlset[i], 0, NULL, 0))
1570 if (!delete_mode && !matches)
1571 die(_("No such URL found: %s"), oldurl);
1572 if (delete_mode && !negative_matches && !push_mode)
1573 die(_("Will not delete all non-push URLs"));
1575 regfree(&old_regex);
1578 git_config_set_multivar(name_buf.buf, newurl, oldurl, 0);
1580 git_config_set_multivar(name_buf.buf, NULL, oldurl, 1);
1584 int cmd_remote(int argc, const char **argv, const char *prefix)
1586 struct option options[] = {
1587 OPT__VERBOSE(&verbose, N_("be verbose; must be placed before a subcommand")),
1592 argc = parse_options(argc, argv, prefix, options, builtin_remote_usage,
1593 PARSE_OPT_STOP_AT_NON_OPTION);
1596 result = show_all();
1597 else if (!strcmp(argv[0], "add"))
1598 result = add(argc, argv);
1599 else if (!strcmp(argv[0], "rename"))
1600 result = mv(argc, argv);
1601 else if (!strcmp(argv[0], "rm") || !strcmp(argv[0], "remove"))
1602 result = rm(argc, argv);
1603 else if (!strcmp(argv[0], "set-head"))
1604 result = set_head(argc, argv);
1605 else if (!strcmp(argv[0], "set-branches"))
1606 result = set_branches(argc, argv);
1607 else if (!strcmp(argv[0], "set-url"))
1608 result = set_url(argc, argv);
1609 else if (!strcmp(argv[0], "show"))
1610 result = show(argc, argv);
1611 else if (!strcmp(argv[0], "prune"))
1612 result = prune(argc, argv);
1613 else if (!strcmp(argv[0], "update"))
1614 result = update(argc, argv);
1616 error(_("Unknown subcommand: %s"), argv[0]);
1617 usage_with_options(builtin_remote_usage, options);
1620 return result ? 1 : 0;