2 #include "parse-options.h"
5 #include "string-list.h"
7 #include "run-command.h"
10 static const char * const builtin_remote_usage
[] = {
11 "git remote [-v | --verbose]",
12 "git remote add [-t <branch>] [-m <master>] [-f] [--mirror] <name> <url>",
13 "git remote rename <old> <new>",
14 "git remote rm <name>",
15 "git remote set-head <name> (-a | -d | <branch>)",
16 "git remote [-v | --verbose] show [-n] <name>",
17 "git remote prune [-n | --dry-run] <name>",
18 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]",
19 "git remote set-branches <name> [--add] <branch>...",
20 "git remote set-url <name> <newurl> [<oldurl>]",
21 "git remote set-url --add <name> <newurl>",
22 "git remote set-url --delete <name> <url>",
26 static const char * const builtin_remote_add_usage
[] = {
27 "git remote add [<options>] <name> <url>",
31 static const char * const builtin_remote_rename_usage
[] = {
32 "git remote rename <old> <new>",
36 static const char * const builtin_remote_rm_usage
[] = {
37 "git remote rm <name>",
41 static const char * const builtin_remote_sethead_usage
[] = {
42 "git remote set-head <name> (-a | -d | <branch>])",
46 static const char * const builtin_remote_setbranches_usage
[] = {
47 "git remote set-branches <name> <branch>...",
48 "git remote set-branches --add <name> <branch>...",
52 static const char * const builtin_remote_show_usage
[] = {
53 "git remote show [<options>] <name>",
57 static const char * const builtin_remote_prune_usage
[] = {
58 "git remote prune [<options>] <name>",
62 static const char * const builtin_remote_update_usage
[] = {
63 "git remote update [<options>] [<group> | <remote>]...",
67 static const char * const builtin_remote_seturl_usage
[] = {
68 "git remote set-url [--push] <name> <newurl> [<oldurl>]",
69 "git remote set-url --add <name> <newurl>",
70 "git remote set-url --delete <name> <url>",
74 #define GET_REF_STATES (1<<0)
75 #define GET_HEAD_NAMES (1<<1)
76 #define GET_PUSH_REF_STATES (1<<2)
80 static int show_all(void);
81 static int prune_remote(const char *remote
, int dry_run
);
83 static inline int postfixcmp(const char *string
, const char *postfix
)
85 int len1
= strlen(string
), len2
= strlen(postfix
);
88 return strcmp(string
+ len1
- len2
, postfix
);
91 static int opt_parse_track(const struct option
*opt
, const char *arg
, int not)
93 struct string_list
*list
= opt
->value
;
95 string_list_clear(list
, 0);
97 string_list_append(list
, arg
);
101 static int fetch_remote(const char *name
)
103 const char *argv
[] = { "fetch", name
, NULL
, NULL
};
108 printf("Updating %s\n", name
);
109 if (run_command_v_opt(argv
, RUN_GIT_CMD
))
110 return error("Could not fetch %s", name
);
120 static int add_branch(const char *key
, const char *branchname
,
121 const char *remotename
, int mirror
, struct strbuf
*tmp
)
124 strbuf_addch(tmp
, '+');
126 strbuf_addf(tmp
, "refs/%s:refs/%s",
127 branchname
, branchname
);
129 strbuf_addf(tmp
, "refs/heads/%s:refs/remotes/%s/%s",
130 branchname
, remotename
, branchname
);
131 return git_config_set_multivar(key
, tmp
->buf
, "^$", 0);
134 static int add(int argc
, const char **argv
)
136 int fetch
= 0, mirror
= 0, fetch_tags
= TAGS_DEFAULT
;
137 struct string_list track
= STRING_LIST_INIT_NODUP
;
138 const char *master
= NULL
;
139 struct remote
*remote
;
140 struct strbuf buf
= STRBUF_INIT
, buf2
= STRBUF_INIT
;
141 const char *name
, *url
;
144 struct option options
[] = {
145 OPT_BOOLEAN('f', "fetch", &fetch
, "fetch the remote branches"),
146 OPT_SET_INT(0, "tags", &fetch_tags
,
147 "import all tags and associated objects when fetching",
149 OPT_SET_INT(0, NULL
, &fetch_tags
,
150 "or do not fetch any tag at all (--no-tags)", TAGS_UNSET
),
151 OPT_CALLBACK('t', "track", &track
, "branch",
152 "branch(es) to track", opt_parse_track
),
153 OPT_STRING('m', "master", &master
, "branch", "master branch"),
154 OPT_BOOLEAN(0, "mirror", &mirror
, "no separate remotes"),
158 argc
= parse_options(argc
, argv
, NULL
, options
, builtin_remote_add_usage
,
162 usage_with_options(builtin_remote_add_usage
, options
);
167 remote
= remote_get(name
);
168 if (remote
&& (remote
->url_nr
> 1 || strcmp(name
, remote
->url
[0]) ||
169 remote
->fetch_refspec_nr
))
170 die("remote %s already exists.", name
);
172 strbuf_addf(&buf2
, "refs/heads/test:refs/remotes/%s/test", name
);
173 if (!valid_fetch_refspec(buf2
.buf
))
174 die("'%s' is not a valid remote name", name
);
176 strbuf_addf(&buf
, "remote.%s.url", name
);
177 if (git_config_set(buf
.buf
, url
))
181 strbuf_addf(&buf
, "remote.%s.fetch", name
);
184 string_list_append(&track
, "*");
185 for (i
= 0; i
< track
.nr
; i
++) {
186 if (add_branch(buf
.buf
, track
.items
[i
].string
,
187 name
, mirror
, &buf2
))
193 strbuf_addf(&buf
, "remote.%s.mirror", name
);
194 if (git_config_set(buf
.buf
, "true"))
198 if (fetch_tags
!= TAGS_DEFAULT
) {
200 strbuf_addf(&buf
, "remote.%s.tagopt", name
);
201 if (git_config_set(buf
.buf
,
202 fetch_tags
== TAGS_SET
? "--tags" : "--no-tags"))
206 if (fetch
&& fetch_remote(name
))
211 strbuf_addf(&buf
, "refs/remotes/%s/HEAD", name
);
214 strbuf_addf(&buf2
, "refs/remotes/%s/%s", name
, master
);
216 if (create_symref(buf
.buf
, buf2
.buf
, "remote add"))
217 return error("Could not setup master '%s'", master
);
220 strbuf_release(&buf
);
221 strbuf_release(&buf2
);
222 string_list_clear(&track
, 0);
229 struct string_list merge
;
233 static struct string_list branch_list
;
235 static const char *abbrev_ref(const char *name
, const char *prefix
)
237 const char *abbrev
= skip_prefix(name
, prefix
);
242 #define abbrev_branch(name) abbrev_ref((name), "refs/heads/")
244 static int config_read_branches(const char *key
, const char *value
, void *cb
)
246 if (!prefixcmp(key
, "branch.")) {
247 const char *orig_key
= key
;
249 struct string_list_item
*item
;
250 struct branch_info
*info
;
251 enum { REMOTE
, MERGE
, REBASE
} type
;
254 if (!postfixcmp(key
, ".remote")) {
255 name
= xstrndup(key
, strlen(key
) - 7);
257 } else if (!postfixcmp(key
, ".merge")) {
258 name
= xstrndup(key
, strlen(key
) - 6);
260 } else if (!postfixcmp(key
, ".rebase")) {
261 name
= xstrndup(key
, strlen(key
) - 7);
266 item
= string_list_insert(&branch_list
, name
);
269 item
->util
= xcalloc(sizeof(struct branch_info
), 1);
271 if (type
== REMOTE
) {
272 if (info
->remote_name
)
273 warning("more than one %s", orig_key
);
274 info
->remote_name
= xstrdup(value
);
275 } else if (type
== MERGE
) {
276 char *space
= strchr(value
, ' ');
277 value
= abbrev_branch(value
);
280 merge
= xstrndup(value
, space
- value
);
281 string_list_append(&info
->merge
, merge
);
282 value
= abbrev_branch(space
+ 1);
283 space
= strchr(value
, ' ');
285 string_list_append(&info
->merge
, xstrdup(value
));
287 info
->rebase
= git_config_bool(orig_key
, value
);
292 static void read_branches(void)
296 git_config(config_read_branches
, NULL
);
300 struct remote
*remote
;
301 struct string_list
new, stale
, tracked
, heads
, push
;
305 static int get_ref_states(const struct ref
*remote_refs
, struct ref_states
*states
)
307 struct ref
*fetch_map
= NULL
, **tail
= &fetch_map
;
308 struct ref
*ref
, *stale_refs
;
311 for (i
= 0; i
< states
->remote
->fetch_refspec_nr
; i
++)
312 if (get_fetch_map(remote_refs
, states
->remote
->fetch
+ i
, &tail
, 1))
313 die("Could not get fetch map for refspec %s",
314 states
->remote
->fetch_refspec
[i
]);
316 states
->new.strdup_strings
= 1;
317 states
->tracked
.strdup_strings
= 1;
318 states
->stale
.strdup_strings
= 1;
319 for (ref
= fetch_map
; ref
; ref
= ref
->next
) {
320 unsigned char sha1
[20];
321 if (!ref
->peer_ref
|| read_ref(ref
->peer_ref
->name
, sha1
))
322 string_list_append(&states
->new, abbrev_branch(ref
->name
));
324 string_list_append(&states
->tracked
, abbrev_branch(ref
->name
));
326 stale_refs
= get_stale_heads(states
->remote
, fetch_map
);
327 for (ref
= stale_refs
; ref
; ref
= ref
->next
) {
328 struct string_list_item
*item
=
329 string_list_append(&states
->stale
, abbrev_branch(ref
->name
));
330 item
->util
= xstrdup(ref
->name
);
332 free_refs(stale_refs
);
333 free_refs(fetch_map
);
335 sort_string_list(&states
->new);
336 sort_string_list(&states
->tracked
);
337 sort_string_list(&states
->stale
);
346 PUSH_STATUS_CREATE
= 0,
348 PUSH_STATUS_UPTODATE
,
349 PUSH_STATUS_FASTFORWARD
,
350 PUSH_STATUS_OUTOFDATE
,
351 PUSH_STATUS_NOTQUERIED
355 static int get_push_ref_states(const struct ref
*remote_refs
,
356 struct ref_states
*states
)
358 struct remote
*remote
= states
->remote
;
359 struct ref
*ref
, *local_refs
, *push_map
;
363 local_refs
= get_local_heads();
364 push_map
= copy_ref_list(remote_refs
);
366 match_refs(local_refs
, &push_map
, remote
->push_refspec_nr
,
367 remote
->push_refspec
, MATCH_REFS_NONE
);
369 states
->push
.strdup_strings
= 1;
370 for (ref
= push_map
; ref
; ref
= ref
->next
) {
371 struct string_list_item
*item
;
372 struct push_info
*info
;
376 hashcpy(ref
->new_sha1
, ref
->peer_ref
->new_sha1
);
378 item
= string_list_append(&states
->push
,
379 abbrev_branch(ref
->peer_ref
->name
));
380 item
->util
= xcalloc(sizeof(struct push_info
), 1);
382 info
->forced
= ref
->force
;
383 info
->dest
= xstrdup(abbrev_branch(ref
->name
));
385 if (is_null_sha1(ref
->new_sha1
)) {
386 info
->status
= PUSH_STATUS_DELETE
;
387 } else if (!hashcmp(ref
->old_sha1
, ref
->new_sha1
))
388 info
->status
= PUSH_STATUS_UPTODATE
;
389 else if (is_null_sha1(ref
->old_sha1
))
390 info
->status
= PUSH_STATUS_CREATE
;
391 else if (has_sha1_file(ref
->old_sha1
) &&
392 ref_newer(ref
->new_sha1
, ref
->old_sha1
))
393 info
->status
= PUSH_STATUS_FASTFORWARD
;
395 info
->status
= PUSH_STATUS_OUTOFDATE
;
397 free_refs(local_refs
);
402 static int get_push_ref_states_noquery(struct ref_states
*states
)
405 struct remote
*remote
= states
->remote
;
406 struct string_list_item
*item
;
407 struct push_info
*info
;
412 states
->push
.strdup_strings
= 1;
413 if (!remote
->push_refspec_nr
) {
414 item
= string_list_append(&states
->push
, "(matching)");
415 info
= item
->util
= xcalloc(sizeof(struct push_info
), 1);
416 info
->status
= PUSH_STATUS_NOTQUERIED
;
417 info
->dest
= xstrdup(item
->string
);
419 for (i
= 0; i
< remote
->push_refspec_nr
; i
++) {
420 struct refspec
*spec
= remote
->push
+ i
;
422 item
= string_list_append(&states
->push
, "(matching)");
423 else if (strlen(spec
->src
))
424 item
= string_list_append(&states
->push
, spec
->src
);
426 item
= string_list_append(&states
->push
, "(delete)");
428 info
= item
->util
= xcalloc(sizeof(struct push_info
), 1);
429 info
->forced
= spec
->force
;
430 info
->status
= PUSH_STATUS_NOTQUERIED
;
431 info
->dest
= xstrdup(spec
->dst
? spec
->dst
: item
->string
);
436 static int get_head_names(const struct ref
*remote_refs
, struct ref_states
*states
)
438 struct ref
*ref
, *matches
;
439 struct ref
*fetch_map
= NULL
, **fetch_map_tail
= &fetch_map
;
440 struct refspec refspec
;
444 refspec
.src
= refspec
.dst
= "refs/heads/*";
445 states
->heads
.strdup_strings
= 1;
446 get_fetch_map(remote_refs
, &refspec
, &fetch_map_tail
, 0);
447 matches
= guess_remote_head(find_ref_by_name(remote_refs
, "HEAD"),
449 for (ref
= matches
; ref
; ref
= ref
->next
)
450 string_list_append(&states
->heads
, abbrev_branch(ref
->name
));
452 free_refs(fetch_map
);
458 struct known_remote
{
459 struct known_remote
*next
;
460 struct remote
*remote
;
463 struct known_remotes
{
464 struct remote
*to_delete
;
465 struct known_remote
*list
;
468 static int add_known_remote(struct remote
*remote
, void *cb_data
)
470 struct known_remotes
*all
= cb_data
;
471 struct known_remote
*r
;
473 if (!strcmp(all
->to_delete
->name
, remote
->name
))
476 r
= xmalloc(sizeof(*r
));
483 struct branches_for_remote
{
484 struct remote
*remote
;
485 struct string_list
*branches
, *skipped
;
486 struct known_remotes
*keep
;
489 static int add_branch_for_removal(const char *refname
,
490 const unsigned char *sha1
, int flags
, void *cb_data
)
492 struct branches_for_remote
*branches
= cb_data
;
493 struct refspec refspec
;
494 struct string_list_item
*item
;
495 struct known_remote
*kr
;
497 memset(&refspec
, 0, sizeof(refspec
));
498 refspec
.dst
= (char *)refname
;
499 if (remote_find_tracking(branches
->remote
, &refspec
))
502 /* don't delete a branch if another remote also uses it */
503 for (kr
= branches
->keep
->list
; kr
; kr
= kr
->next
) {
504 memset(&refspec
, 0, sizeof(refspec
));
505 refspec
.dst
= (char *)refname
;
506 if (!remote_find_tracking(kr
->remote
, &refspec
))
510 /* don't delete non-remote-tracking refs */
511 if (prefixcmp(refname
, "refs/remotes")) {
512 /* advise user how to delete local branches */
513 if (!prefixcmp(refname
, "refs/heads/"))
514 string_list_append(branches
->skipped
,
515 abbrev_branch(refname
));
516 /* silently skip over other non-remote refs */
520 /* make sure that symrefs are deleted */
521 if (flags
& REF_ISSYMREF
)
522 return unlink(git_path("%s", refname
));
524 item
= string_list_append(branches
->branches
, refname
);
525 item
->util
= xmalloc(20);
526 hashcpy(item
->util
, sha1
);
534 struct string_list
*remote_branches
;
537 static int read_remote_branches(const char *refname
,
538 const unsigned char *sha1
, int flags
, void *cb_data
)
540 struct rename_info
*rename
= cb_data
;
541 struct strbuf buf
= STRBUF_INIT
;
542 struct string_list_item
*item
;
544 unsigned char orig_sha1
[20];
547 strbuf_addf(&buf
, "refs/remotes/%s", rename
->old
);
548 if (!prefixcmp(refname
, buf
.buf
)) {
549 item
= string_list_append(rename
->remote_branches
, xstrdup(refname
));
550 symref
= resolve_ref(refname
, orig_sha1
, 1, &flag
);
551 if (flag
& REF_ISSYMREF
)
552 item
->util
= xstrdup(symref
);
560 static int migrate_file(struct remote
*remote
)
562 struct strbuf buf
= STRBUF_INIT
;
566 strbuf_addf(&buf
, "remote.%s.url", remote
->name
);
567 for (i
= 0; i
< remote
->url_nr
; i
++)
568 if (git_config_set_multivar(buf
.buf
, remote
->url
[i
], "^$", 0))
569 return error("Could not append '%s' to '%s'",
570 remote
->url
[i
], buf
.buf
);
572 strbuf_addf(&buf
, "remote.%s.push", remote
->name
);
573 for (i
= 0; i
< remote
->push_refspec_nr
; i
++)
574 if (git_config_set_multivar(buf
.buf
, remote
->push_refspec
[i
], "^$", 0))
575 return error("Could not append '%s' to '%s'",
576 remote
->push_refspec
[i
], buf
.buf
);
578 strbuf_addf(&buf
, "remote.%s.fetch", remote
->name
);
579 for (i
= 0; i
< remote
->fetch_refspec_nr
; i
++)
580 if (git_config_set_multivar(buf
.buf
, remote
->fetch_refspec
[i
], "^$", 0))
581 return error("Could not append '%s' to '%s'",
582 remote
->fetch_refspec
[i
], buf
.buf
);
583 if (remote
->origin
== REMOTE_REMOTES
)
584 path
= git_path("remotes/%s", remote
->name
);
585 else if (remote
->origin
== REMOTE_BRANCHES
)
586 path
= git_path("branches/%s", remote
->name
);
588 unlink_or_warn(path
);
592 static int mv(int argc
, const char **argv
)
594 struct option options
[] = {
597 struct remote
*oldremote
, *newremote
;
598 struct strbuf buf
= STRBUF_INIT
, buf2
= STRBUF_INIT
, buf3
= STRBUF_INIT
;
599 struct string_list remote_branches
= STRING_LIST_INIT_NODUP
;
600 struct rename_info rename
;
604 usage_with_options(builtin_remote_rename_usage
, options
);
606 rename
.old
= argv
[1];
607 rename
.new = argv
[2];
608 rename
.remote_branches
= &remote_branches
;
610 oldremote
= remote_get(rename
.old
);
612 die("No such remote: %s", rename
.old
);
614 if (!strcmp(rename
.old
, rename
.new) && oldremote
->origin
!= REMOTE_CONFIG
)
615 return migrate_file(oldremote
);
617 newremote
= remote_get(rename
.new);
618 if (newremote
&& (newremote
->url_nr
> 1 || newremote
->fetch_refspec_nr
))
619 die("remote %s already exists.", rename
.new);
621 strbuf_addf(&buf
, "refs/heads/test:refs/remotes/%s/test", rename
.new);
622 if (!valid_fetch_refspec(buf
.buf
))
623 die("'%s' is not a valid remote name", rename
.new);
626 strbuf_addf(&buf
, "remote.%s", rename
.old
);
627 strbuf_addf(&buf2
, "remote.%s", rename
.new);
628 if (git_config_rename_section(buf
.buf
, buf2
.buf
) < 1)
629 return error("Could not rename config section '%s' to '%s'",
633 strbuf_addf(&buf
, "remote.%s.fetch", rename
.new);
634 if (git_config_set_multivar(buf
.buf
, NULL
, NULL
, 1))
635 return error("Could not remove config section '%s'", buf
.buf
);
636 for (i
= 0; i
< oldremote
->fetch_refspec_nr
; i
++) {
640 strbuf_addstr(&buf2
, oldremote
->fetch_refspec
[i
]);
641 ptr
= strstr(buf2
.buf
, rename
.old
);
643 strbuf_splice(&buf2
, ptr
-buf2
.buf
, strlen(rename
.old
),
644 rename
.new, strlen(rename
.new));
645 if (git_config_set_multivar(buf
.buf
, buf2
.buf
, "^$", 0))
646 return error("Could not append '%s'", buf
.buf
);
650 for (i
= 0; i
< branch_list
.nr
; i
++) {
651 struct string_list_item
*item
= branch_list
.items
+ i
;
652 struct branch_info
*info
= item
->util
;
653 if (info
->remote_name
&& !strcmp(info
->remote_name
, rename
.old
)) {
655 strbuf_addf(&buf
, "branch.%s.remote", item
->string
);
656 if (git_config_set(buf
.buf
, rename
.new)) {
657 return error("Could not set '%s'", buf
.buf
);
663 * First remove symrefs, then rename the rest, finally create
666 for_each_ref(read_remote_branches
, &rename
);
667 for (i
= 0; i
< remote_branches
.nr
; i
++) {
668 struct string_list_item
*item
= remote_branches
.items
+ i
;
670 unsigned char sha1
[20];
672 resolve_ref(item
->string
, sha1
, 1, &flag
);
673 if (!(flag
& REF_ISSYMREF
))
675 if (delete_ref(item
->string
, NULL
, REF_NODEREF
))
676 die("deleting '%s' failed", item
->string
);
678 for (i
= 0; i
< remote_branches
.nr
; i
++) {
679 struct string_list_item
*item
= remote_branches
.items
+ i
;
684 strbuf_addstr(&buf
, item
->string
);
685 strbuf_splice(&buf
, strlen("refs/remotes/"), strlen(rename
.old
),
686 rename
.new, strlen(rename
.new));
688 strbuf_addf(&buf2
, "remote: renamed %s to %s",
689 item
->string
, buf
.buf
);
690 if (rename_ref(item
->string
, buf
.buf
, buf2
.buf
))
691 die("renaming '%s' failed", item
->string
);
693 for (i
= 0; i
< remote_branches
.nr
; i
++) {
694 struct string_list_item
*item
= remote_branches
.items
+ i
;
699 strbuf_addstr(&buf
, item
->string
);
700 strbuf_splice(&buf
, strlen("refs/remotes/"), strlen(rename
.old
),
701 rename
.new, strlen(rename
.new));
703 strbuf_addstr(&buf2
, item
->util
);
704 strbuf_splice(&buf2
, strlen("refs/remotes/"), strlen(rename
.old
),
705 rename
.new, strlen(rename
.new));
707 strbuf_addf(&buf3
, "remote: renamed %s to %s",
708 item
->string
, buf
.buf
);
709 if (create_symref(buf
.buf
, buf2
.buf
, buf3
.buf
))
710 die("creating '%s' failed", buf
.buf
);
715 static int remove_branches(struct string_list
*branches
)
718 for (i
= 0; i
< branches
->nr
; i
++) {
719 struct string_list_item
*item
= branches
->items
+ i
;
720 const char *refname
= item
->string
;
721 unsigned char *sha1
= item
->util
;
723 if (delete_ref(refname
, sha1
, 0))
724 result
|= error("Could not remove branch %s", refname
);
729 static int rm(int argc
, const char **argv
)
731 struct option options
[] = {
734 struct remote
*remote
;
735 struct strbuf buf
= STRBUF_INIT
;
736 struct known_remotes known_remotes
= { NULL
, NULL
};
737 struct string_list branches
= STRING_LIST_INIT_DUP
;
738 struct string_list skipped
= STRING_LIST_INIT_DUP
;
739 struct branches_for_remote cb_data
;
742 memset(&cb_data
, 0, sizeof(cb_data
));
743 cb_data
.branches
= &branches
;
744 cb_data
.skipped
= &skipped
;
745 cb_data
.keep
= &known_remotes
;
748 usage_with_options(builtin_remote_rm_usage
, options
);
750 remote
= remote_get(argv
[1]);
752 die("No such remote: %s", argv
[1]);
754 known_remotes
.to_delete
= remote
;
755 for_each_remote(add_known_remote
, &known_remotes
);
757 strbuf_addf(&buf
, "remote.%s", remote
->name
);
758 if (git_config_rename_section(buf
.buf
, NULL
) < 1)
759 return error("Could not remove config section '%s'", buf
.buf
);
762 for (i
= 0; i
< branch_list
.nr
; i
++) {
763 struct string_list_item
*item
= branch_list
.items
+ i
;
764 struct branch_info
*info
= item
->util
;
765 if (info
->remote_name
&& !strcmp(info
->remote_name
, remote
->name
)) {
766 const char *keys
[] = { "remote", "merge", NULL
}, **k
;
767 for (k
= keys
; *k
; k
++) {
769 strbuf_addf(&buf
, "branch.%s.%s",
771 if (git_config_set(buf
.buf
, NULL
)) {
772 strbuf_release(&buf
);
780 * We cannot just pass a function to for_each_ref() which deletes
781 * the branches one by one, since for_each_ref() relies on cached
782 * refs, which are invalidated when deleting a branch.
784 cb_data
.remote
= remote
;
785 result
= for_each_ref(add_branch_for_removal
, &cb_data
);
786 strbuf_release(&buf
);
789 result
= remove_branches(&branches
);
790 string_list_clear(&branches
, 1);
793 fprintf(stderr
, skipped
.nr
== 1 ?
794 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
795 "to delete it, use:\n" :
796 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
797 "to delete them, use:\n");
798 for (i
= 0; i
< skipped
.nr
; i
++)
799 fprintf(stderr
, " git branch -d %s\n",
800 skipped
.items
[i
].string
);
802 string_list_clear(&skipped
, 0);
807 static void clear_push_info(void *util
, const char *string
)
809 struct push_info
*info
= util
;
814 static void free_remote_ref_states(struct ref_states
*states
)
816 string_list_clear(&states
->new, 0);
817 string_list_clear(&states
->stale
, 1);
818 string_list_clear(&states
->tracked
, 0);
819 string_list_clear(&states
->heads
, 0);
820 string_list_clear_func(&states
->push
, clear_push_info
);
823 static int append_ref_to_tracked_list(const char *refname
,
824 const unsigned char *sha1
, int flags
, void *cb_data
)
826 struct ref_states
*states
= cb_data
;
827 struct refspec refspec
;
829 if (flags
& REF_ISSYMREF
)
832 memset(&refspec
, 0, sizeof(refspec
));
833 refspec
.dst
= (char *)refname
;
834 if (!remote_find_tracking(states
->remote
, &refspec
))
835 string_list_append(&states
->tracked
, abbrev_branch(refspec
.src
));
840 static int get_remote_ref_states(const char *name
,
841 struct ref_states
*states
,
844 struct transport
*transport
;
845 const struct ref
*remote_refs
;
847 states
->remote
= remote_get(name
);
849 return error("No such remote: %s", name
);
854 transport
= transport_get(states
->remote
, states
->remote
->url_nr
> 0 ?
855 states
->remote
->url
[0] : NULL
);
856 remote_refs
= transport_get_remote_refs(transport
);
857 transport_disconnect(transport
);
860 if (query
& GET_REF_STATES
)
861 get_ref_states(remote_refs
, states
);
862 if (query
& GET_HEAD_NAMES
)
863 get_head_names(remote_refs
, states
);
864 if (query
& GET_PUSH_REF_STATES
)
865 get_push_ref_states(remote_refs
, states
);
867 for_each_ref(append_ref_to_tracked_list
, states
);
868 sort_string_list(&states
->tracked
);
869 get_push_ref_states_noquery(states
);
876 struct string_list
*list
;
877 struct ref_states
*states
;
882 static int add_remote_to_show_info(struct string_list_item
*item
, void *cb_data
)
884 struct show_info
*info
= cb_data
;
885 int n
= strlen(item
->string
);
888 string_list_insert(info
->list
, item
->string
);
892 static int show_remote_info_item(struct string_list_item
*item
, void *cb_data
)
894 struct show_info
*info
= cb_data
;
895 struct ref_states
*states
= info
->states
;
896 const char *name
= item
->string
;
898 if (states
->queried
) {
899 const char *fmt
= "%s";
900 const char *arg
= "";
901 if (string_list_has_string(&states
->new, name
)) {
902 fmt
= " new (next fetch will store in remotes/%s)";
903 arg
= states
->remote
->name
;
904 } else if (string_list_has_string(&states
->tracked
, name
))
906 else if (string_list_has_string(&states
->stale
, name
))
907 arg
= " stale (use 'git remote prune' to remove)";
910 printf(" %-*s", info
->width
, name
);
914 printf(" %s\n", name
);
919 static int add_local_to_show_info(struct string_list_item
*branch_item
, void *cb_data
)
921 struct show_info
*show_info
= cb_data
;
922 struct ref_states
*states
= show_info
->states
;
923 struct branch_info
*branch_info
= branch_item
->util
;
924 struct string_list_item
*item
;
927 if (!branch_info
->merge
.nr
|| !branch_info
->remote_name
||
928 strcmp(states
->remote
->name
, branch_info
->remote_name
))
930 if ((n
= strlen(branch_item
->string
)) > show_info
->width
)
931 show_info
->width
= n
;
932 if (branch_info
->rebase
)
933 show_info
->any_rebase
= 1;
935 item
= string_list_insert(show_info
->list
, branch_item
->string
);
936 item
->util
= branch_info
;
941 static int show_local_info_item(struct string_list_item
*item
, void *cb_data
)
943 struct show_info
*show_info
= cb_data
;
944 struct branch_info
*branch_info
= item
->util
;
945 struct string_list
*merge
= &branch_info
->merge
;
949 if (branch_info
->rebase
&& branch_info
->merge
.nr
> 1) {
950 error("invalid branch.%s.merge; cannot rebase onto > 1 branch",
955 printf(" %-*s ", show_info
->width
, item
->string
);
956 if (branch_info
->rebase
) {
957 printf("rebases onto remote %s\n", merge
->items
[0].string
);
959 } else if (show_info
->any_rebase
) {
960 printf(" merges with remote %s\n", merge
->items
[0].string
);
961 also
= " and with remote";
963 printf("merges with remote %s\n", merge
->items
[0].string
);
964 also
= " and with remote";
966 for (i
= 1; i
< merge
->nr
; i
++)
967 printf(" %-*s %s %s\n", show_info
->width
, "", also
,
968 merge
->items
[i
].string
);
973 static int add_push_to_show_info(struct string_list_item
*push_item
, void *cb_data
)
975 struct show_info
*show_info
= cb_data
;
976 struct push_info
*push_info
= push_item
->util
;
977 struct string_list_item
*item
;
979 if ((n
= strlen(push_item
->string
)) > show_info
->width
)
980 show_info
->width
= n
;
981 if ((n
= strlen(push_info
->dest
)) > show_info
->width2
)
982 show_info
->width2
= n
;
983 item
= string_list_append(show_info
->list
, push_item
->string
);
984 item
->util
= push_item
->util
;
989 * Sorting comparison for a string list that has push_info
990 * structs in its util field
992 static int cmp_string_with_push(const void *va
, const void *vb
)
994 const struct string_list_item
*a
= va
;
995 const struct string_list_item
*b
= vb
;
996 const struct push_info
*a_push
= a
->util
;
997 const struct push_info
*b_push
= b
->util
;
998 int cmp
= strcmp(a
->string
, b
->string
);
999 return cmp
? cmp
: strcmp(a_push
->dest
, b_push
->dest
);
1002 static int show_push_info_item(struct string_list_item
*item
, void *cb_data
)
1004 struct show_info
*show_info
= cb_data
;
1005 struct push_info
*push_info
= item
->util
;
1006 char *src
= item
->string
, *status
= NULL
;
1008 switch (push_info
->status
) {
1009 case PUSH_STATUS_CREATE
:
1012 case PUSH_STATUS_DELETE
:
1016 case PUSH_STATUS_UPTODATE
:
1017 status
= "up to date";
1019 case PUSH_STATUS_FASTFORWARD
:
1020 status
= "fast-forwardable";
1022 case PUSH_STATUS_OUTOFDATE
:
1023 status
= "local out of date";
1025 case PUSH_STATUS_NOTQUERIED
:
1029 printf(" %-*s %s to %-*s (%s)\n", show_info
->width
, src
,
1030 push_info
->forced
? "forces" : "pushes",
1031 show_info
->width2
, push_info
->dest
, status
);
1033 printf(" %-*s %s to %s\n", show_info
->width
, src
,
1034 push_info
->forced
? "forces" : "pushes",
1039 static int show(int argc
, const char **argv
)
1041 int no_query
= 0, result
= 0, query_flag
= 0;
1042 struct option options
[] = {
1043 OPT_BOOLEAN('n', NULL
, &no_query
, "do not query remotes"),
1046 struct ref_states states
;
1047 struct string_list info_list
= STRING_LIST_INIT_NODUP
;
1048 struct show_info info
;
1050 argc
= parse_options(argc
, argv
, NULL
, options
, builtin_remote_show_usage
,
1057 query_flag
= (GET_REF_STATES
| GET_HEAD_NAMES
| GET_PUSH_REF_STATES
);
1059 memset(&states
, 0, sizeof(states
));
1060 memset(&info
, 0, sizeof(info
));
1061 info
.states
= &states
;
1062 info
.list
= &info_list
;
1063 for (; argc
; argc
--, argv
++) {
1068 get_remote_ref_states(*argv
, &states
, query_flag
);
1070 printf("* remote %s\n", *argv
);
1071 printf(" Fetch URL: %s\n", states
.remote
->url_nr
> 0 ?
1072 states
.remote
->url
[0] : "(no URL)");
1073 if (states
.remote
->pushurl_nr
) {
1074 url
= states
.remote
->pushurl
;
1075 url_nr
= states
.remote
->pushurl_nr
;
1077 url
= states
.remote
->url
;
1078 url_nr
= states
.remote
->url_nr
;
1080 for (i
=0; i
< url_nr
; i
++)
1081 printf(" Push URL: %s\n", url
[i
]);
1083 printf(" Push URL: %s\n", "(no URL)");
1085 printf(" HEAD branch: (not queried)\n");
1086 else if (!states
.heads
.nr
)
1087 printf(" HEAD branch: (unknown)\n");
1088 else if (states
.heads
.nr
== 1)
1089 printf(" HEAD branch: %s\n", states
.heads
.items
[0].string
);
1091 printf(" HEAD branch (remote HEAD is ambiguous,"
1092 " may be one of the following):\n");
1093 for (i
= 0; i
< states
.heads
.nr
; i
++)
1094 printf(" %s\n", states
.heads
.items
[i
].string
);
1097 /* remote branch info */
1099 for_each_string_list(&states
.new, add_remote_to_show_info
, &info
);
1100 for_each_string_list(&states
.tracked
, add_remote_to_show_info
, &info
);
1101 for_each_string_list(&states
.stale
, add_remote_to_show_info
, &info
);
1103 printf(" Remote branch%s:%s\n",
1104 info
.list
->nr
> 1 ? "es" : "",
1105 no_query
? " (status not queried)" : "");
1106 for_each_string_list(info
.list
, show_remote_info_item
, &info
);
1107 string_list_clear(info
.list
, 0);
1111 info
.any_rebase
= 0;
1112 for_each_string_list(&branch_list
, add_local_to_show_info
, &info
);
1114 printf(" Local branch%s configured for 'git pull':\n",
1115 info
.list
->nr
> 1 ? "es" : "");
1116 for_each_string_list(info
.list
, show_local_info_item
, &info
);
1117 string_list_clear(info
.list
, 0);
1120 if (states
.remote
->mirror
)
1121 printf(" Local refs will be mirrored by 'git push'\n");
1123 info
.width
= info
.width2
= 0;
1124 for_each_string_list(&states
.push
, add_push_to_show_info
, &info
);
1125 qsort(info
.list
->items
, info
.list
->nr
,
1126 sizeof(*info
.list
->items
), cmp_string_with_push
);
1128 printf(" Local ref%s configured for 'git push'%s:\n",
1129 info
.list
->nr
> 1 ? "s" : "",
1130 no_query
? " (status not queried)" : "");
1131 for_each_string_list(info
.list
, show_push_info_item
, &info
);
1132 string_list_clear(info
.list
, 0);
1134 free_remote_ref_states(&states
);
1140 static int set_head(int argc
, const char **argv
)
1142 int i
, opt_a
= 0, opt_d
= 0, result
= 0;
1143 struct strbuf buf
= STRBUF_INIT
, buf2
= STRBUF_INIT
;
1144 char *head_name
= NULL
;
1146 struct option options
[] = {
1147 OPT_BOOLEAN('a', "auto", &opt_a
,
1148 "set refs/remotes/<name>/HEAD according to remote"),
1149 OPT_BOOLEAN('d', "delete", &opt_d
,
1150 "delete refs/remotes/<name>/HEAD"),
1153 argc
= parse_options(argc
, argv
, NULL
, options
, builtin_remote_sethead_usage
,
1156 strbuf_addf(&buf
, "refs/remotes/%s/HEAD", argv
[0]);
1158 if (!opt_a
&& !opt_d
&& argc
== 2) {
1159 head_name
= xstrdup(argv
[1]);
1160 } else if (opt_a
&& !opt_d
&& argc
== 1) {
1161 struct ref_states states
;
1162 memset(&states
, 0, sizeof(states
));
1163 get_remote_ref_states(argv
[0], &states
, GET_HEAD_NAMES
);
1164 if (!states
.heads
.nr
)
1165 result
|= error("Cannot determine remote HEAD");
1166 else if (states
.heads
.nr
> 1) {
1167 result
|= error("Multiple remote HEAD branches. "
1168 "Please choose one explicitly with:");
1169 for (i
= 0; i
< states
.heads
.nr
; i
++)
1170 fprintf(stderr
, " git remote set-head %s %s\n",
1171 argv
[0], states
.heads
.items
[i
].string
);
1173 head_name
= xstrdup(states
.heads
.items
[0].string
);
1174 free_remote_ref_states(&states
);
1175 } else if (opt_d
&& !opt_a
&& argc
== 1) {
1176 if (delete_ref(buf
.buf
, NULL
, REF_NODEREF
))
1177 result
|= error("Could not delete %s", buf
.buf
);
1179 usage_with_options(builtin_remote_sethead_usage
, options
);
1182 unsigned char sha1
[20];
1183 strbuf_addf(&buf2
, "refs/remotes/%s/%s", argv
[0], head_name
);
1184 /* make sure it's valid */
1185 if (!resolve_ref(buf2
.buf
, sha1
, 1, NULL
))
1186 result
|= error("Not a valid ref: %s", buf2
.buf
);
1187 else if (create_symref(buf
.buf
, buf2
.buf
, "remote set-head"))
1188 result
|= error("Could not setup %s", buf
.buf
);
1190 printf("%s/HEAD set to %s\n", argv
[0], head_name
);
1194 strbuf_release(&buf
);
1195 strbuf_release(&buf2
);
1199 static int prune(int argc
, const char **argv
)
1201 int dry_run
= 0, result
= 0;
1202 struct option options
[] = {
1203 OPT__DRY_RUN(&dry_run
),
1207 argc
= parse_options(argc
, argv
, NULL
, options
, builtin_remote_prune_usage
,
1211 usage_with_options(builtin_remote_prune_usage
, options
);
1213 for (; argc
; argc
--, argv
++)
1214 result
|= prune_remote(*argv
, dry_run
);
1219 static int prune_remote(const char *remote
, int dry_run
)
1222 struct ref_states states
;
1223 const char *dangling_msg
= dry_run
1224 ? " %s will become dangling!\n"
1225 : " %s has become dangling!\n";
1227 memset(&states
, 0, sizeof(states
));
1228 get_remote_ref_states(remote
, &states
, GET_REF_STATES
);
1230 if (states
.stale
.nr
) {
1231 printf("Pruning %s\n", remote
);
1233 states
.remote
->url_nr
1234 ? states
.remote
->url
[0]
1238 for (i
= 0; i
< states
.stale
.nr
; i
++) {
1239 const char *refname
= states
.stale
.items
[i
].util
;
1242 result
|= delete_ref(refname
, NULL
, 0);
1244 printf(" * [%s] %s\n", dry_run
? "would prune" : "pruned",
1245 abbrev_ref(refname
, "refs/remotes/"));
1246 warn_dangling_symref(stdout
, dangling_msg
, refname
);
1249 free_remote_ref_states(&states
);
1253 static int get_remote_default(const char *key
, const char *value
, void *priv
)
1255 if (strcmp(key
, "remotes.default") == 0) {
1262 static int update(int argc
, const char **argv
)
1265 struct option options
[] = {
1266 OPT_BOOLEAN('p', "prune", &prune
,
1267 "prune remotes after fetching"),
1270 const char **fetch_argv
;
1272 int default_defined
= 0;
1274 fetch_argv
= xmalloc(sizeof(char *) * (argc
+5));
1276 argc
= parse_options(argc
, argv
, NULL
, options
, builtin_remote_update_usage
,
1277 PARSE_OPT_KEEP_ARGV0
);
1279 fetch_argv
[fetch_argc
++] = "fetch";
1282 fetch_argv
[fetch_argc
++] = "--prune";
1284 fetch_argv
[fetch_argc
++] = "-v";
1285 fetch_argv
[fetch_argc
++] = "--multiple";
1287 fetch_argv
[fetch_argc
++] = "default";
1288 for (i
= 1; i
< argc
; i
++)
1289 fetch_argv
[fetch_argc
++] = argv
[i
];
1291 if (strcmp(fetch_argv
[fetch_argc
-1], "default") == 0) {
1292 git_config(get_remote_default
, &default_defined
);
1293 if (!default_defined
)
1294 fetch_argv
[fetch_argc
-1] = "--all";
1297 fetch_argv
[fetch_argc
] = NULL
;
1299 return run_command_v_opt(fetch_argv
, RUN_GIT_CMD
);
1302 static int remove_all_fetch_refspecs(const char *remote
, const char *key
)
1304 return git_config_set_multivar(key
, NULL
, NULL
, 1);
1307 static int add_branches(struct remote
*remote
, const char **branches
,
1310 const char *remotename
= remote
->name
;
1311 int mirror
= remote
->mirror
;
1312 struct strbuf refspec
= STRBUF_INIT
;
1314 for (; *branches
; branches
++)
1315 if (add_branch(key
, *branches
, remotename
, mirror
, &refspec
)) {
1316 strbuf_release(&refspec
);
1320 strbuf_release(&refspec
);
1324 static int set_remote_branches(const char *remotename
, const char **branches
,
1327 struct strbuf key
= STRBUF_INIT
;
1328 struct remote
*remote
;
1330 strbuf_addf(&key
, "remote.%s.fetch", remotename
);
1332 if (!remote_is_configured(remotename
))
1333 die("No such remote '%s'", remotename
);
1334 remote
= remote_get(remotename
);
1336 if (!add_mode
&& remove_all_fetch_refspecs(remotename
, key
.buf
)) {
1337 strbuf_release(&key
);
1340 if (add_branches(remote
, branches
, key
.buf
)) {
1341 strbuf_release(&key
);
1345 strbuf_release(&key
);
1349 static int set_branches(int argc
, const char **argv
)
1352 struct option options
[] = {
1353 OPT_BOOLEAN('\0', "add", &add_mode
, "add branch"),
1357 argc
= parse_options(argc
, argv
, NULL
, options
,
1358 builtin_remote_setbranches_usage
, 0);
1360 error("no remote specified");
1361 usage_with_options(builtin_remote_seturl_usage
, options
);
1365 return set_remote_branches(argv
[0], argv
+ 1, add_mode
);
1368 static int set_url(int argc
, const char **argv
)
1370 int i
, push_mode
= 0, add_mode
= 0, delete_mode
= 0;
1371 int matches
= 0, negative_matches
= 0;
1372 const char *remotename
= NULL
;
1373 const char *newurl
= NULL
;
1374 const char *oldurl
= NULL
;
1375 struct remote
*remote
;
1377 const char **urlset
;
1379 struct strbuf name_buf
= STRBUF_INIT
;
1380 struct option options
[] = {
1381 OPT_BOOLEAN('\0', "push", &push_mode
,
1382 "manipulate push URLs"),
1383 OPT_BOOLEAN('\0', "add", &add_mode
,
1385 OPT_BOOLEAN('\0', "delete", &delete_mode
,
1389 argc
= parse_options(argc
, argv
, NULL
, options
, builtin_remote_update_usage
,
1390 PARSE_OPT_KEEP_ARGV0
);
1392 if (add_mode
&& delete_mode
)
1393 die("--add --delete doesn't make sense");
1395 if (argc
< 3 || argc
> 4 || ((add_mode
|| delete_mode
) && argc
!= 3))
1396 usage_with_options(builtin_remote_seturl_usage
, options
);
1398 remotename
= argv
[1];
1406 if (!remote_is_configured(remotename
))
1407 die("No such remote '%s'", remotename
);
1408 remote
= remote_get(remotename
);
1411 strbuf_addf(&name_buf
, "remote.%s.pushurl", remotename
);
1412 urlset
= remote
->pushurl
;
1413 urlset_nr
= remote
->pushurl_nr
;
1415 strbuf_addf(&name_buf
, "remote.%s.url", remotename
);
1416 urlset
= remote
->url
;
1417 urlset_nr
= remote
->url_nr
;
1420 /* Special cases that add new entry. */
1421 if ((!oldurl
&& !delete_mode
) || add_mode
) {
1423 git_config_set_multivar(name_buf
.buf
, newurl
,
1426 git_config_set(name_buf
.buf
, newurl
);
1427 strbuf_release(&name_buf
);
1431 /* Old URL specified. Demand that one matches. */
1432 if (regcomp(&old_regex
, oldurl
, REG_EXTENDED
))
1433 die("Invalid old URL pattern: %s", oldurl
);
1435 for (i
= 0; i
< urlset_nr
; i
++)
1436 if (!regexec(&old_regex
, urlset
[i
], 0, NULL
, 0))
1440 if (!delete_mode
&& !matches
)
1441 die("No such URL found: %s", oldurl
);
1442 if (delete_mode
&& !negative_matches
&& !push_mode
)
1443 die("Will not delete all non-push URLs");
1445 regfree(&old_regex
);
1448 git_config_set_multivar(name_buf
.buf
, newurl
, oldurl
, 0);
1450 git_config_set_multivar(name_buf
.buf
, NULL
, oldurl
, 1);
1454 static int get_one_entry(struct remote
*remote
, void *priv
)
1456 struct string_list
*list
= priv
;
1457 struct strbuf url_buf
= STRBUF_INIT
;
1461 if (remote
->url_nr
> 0) {
1462 strbuf_addf(&url_buf
, "%s (fetch)", remote
->url
[0]);
1463 string_list_append(list
, remote
->name
)->util
=
1464 strbuf_detach(&url_buf
, NULL
);
1466 string_list_append(list
, remote
->name
)->util
= NULL
;
1467 if (remote
->pushurl_nr
) {
1468 url
= remote
->pushurl
;
1469 url_nr
= remote
->pushurl_nr
;
1472 url_nr
= remote
->url_nr
;
1474 for (i
= 0; i
< url_nr
; i
++)
1476 strbuf_addf(&url_buf
, "%s (push)", url
[i
]);
1477 string_list_append(list
, remote
->name
)->util
=
1478 strbuf_detach(&url_buf
, NULL
);
1484 static int show_all(void)
1486 struct string_list list
= STRING_LIST_INIT_NODUP
;
1489 list
.strdup_strings
= 1;
1490 result
= for_each_remote(get_one_entry
, &list
);
1495 sort_string_list(&list
);
1496 for (i
= 0; i
< list
.nr
; i
++) {
1497 struct string_list_item
*item
= list
.items
+ i
;
1499 printf("%s\t%s\n", item
->string
,
1500 item
->util
? (const char *)item
->util
: "");
1502 if (i
&& !strcmp((item
- 1)->string
, item
->string
))
1504 printf("%s\n", item
->string
);
1508 string_list_clear(&list
, 1);
1512 int cmd_remote(int argc
, const char **argv
, const char *prefix
)
1514 struct option options
[] = {
1515 OPT_BOOLEAN('v', "verbose", &verbose
, "be verbose; must be placed before a subcommand"),
1520 argc
= parse_options(argc
, argv
, prefix
, options
, builtin_remote_usage
,
1521 PARSE_OPT_STOP_AT_NON_OPTION
);
1524 result
= show_all();
1525 else if (!strcmp(argv
[0], "add"))
1526 result
= add(argc
, argv
);
1527 else if (!strcmp(argv
[0], "rename"))
1528 result
= mv(argc
, argv
);
1529 else if (!strcmp(argv
[0], "rm"))
1530 result
= rm(argc
, argv
);
1531 else if (!strcmp(argv
[0], "set-head"))
1532 result
= set_head(argc
, argv
);
1533 else if (!strcmp(argv
[0], "set-branches"))
1534 result
= set_branches(argc
, argv
);
1535 else if (!strcmp(argv
[0], "set-url"))
1536 result
= set_url(argc
, argv
);
1537 else if (!strcmp(argv
[0], "show"))
1538 result
= show(argc
, argv
);
1539 else if (!strcmp(argv
[0], "prune"))
1540 result
= prune(argc
, argv
);
1541 else if (!strcmp(argv
[0], "update"))
1542 result
= update(argc
, argv
);
1544 error("Unknown subcommand: %s", argv
[0]);
1545 usage_with_options(builtin_remote_usage
, options
);
1548 return result
? 1 : 0;