kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

git remote update: New option --prune 

With the --prune (or -p) option, git remote update will also prune
all the remotes that it fetches.  Previously, you had to do a manual
git remote prune <remote> for each of the remotes you wanted to
prune, and this could be tedious with many remotes.

A single command will now update a set of remotes, and remove all
stale branches: git remote update -p [group]

Signed-off-by: Finn Arne Gangstad <finnag@pvv.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Finn Arne Gangstad 2009-04-03 11:03:44 +02:00 committed by Junio C Hamano
parent b92c5f228a
commit efa54803cb
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-remote.txt
View File

@ -16,7 +16,7 @@ SYNOPSIS
'git remote set-head' <name> [-a | -d | <branch>] 'git remote set-head' <name> [-a | -d | <branch>]
'git remote show' [-n] <name> 'git remote show' [-n] <name>
'git remote prune' [-n | --dry-run] <name> 'git remote prune' [-n | --dry-run] <name>
'git remote update' [group] 'git remote update' [-p | --prune] [group]


DESCRIPTION DESCRIPTION
----------- -----------
@ -125,6 +125,8 @@ the configuration parameter remotes.default will get used; if
remotes.default is not defined, all remotes which do not have the remotes.default is not defined, all remotes which do not have the
configuration parameter remote.<name>.skipDefaultUpdate set to true will configuration parameter remote.<name>.skipDefaultUpdate set to true will
be updated. (See linkgit:git-config[1]). be updated. (See linkgit:git-config[1]).
+
With `--prune` option, prune all the remotes that are updated.




DISCUSSION DISCUSSION

20
builtin-remote.c
View File

@ -15,7 +15,7 @@ static const char * const builtin_remote_usage[] = {
"git remote set-head <name> [-a | -d | <branch>]", "git remote set-head <name> [-a | -d | <branch>]",
"git remote show [-n] <name>", "git remote show [-n] <name>",
"git remote prune [-n | --dry-run] <name>", "git remote prune [-n | --dry-run] <name>",
"git remote [-v | --verbose] update [group]", "git remote [-v | --verbose] update [-p | --prune] [group]",
NULL NULL
}; };


@ -1208,10 +1208,18 @@ static int get_remote_group(const char *key, const char *value, void *cb)


static int update(int argc, const char **argv) static int update(int argc, const char **argv)
{ {
int i, result = 0; int i, result = 0, prune = 0;
struct string_list list = { NULL, 0, 0, 0 }; struct string_list list = { NULL, 0, 0, 0 };
static const char *default_argv[] = { NULL, "default", NULL }; static const char *default_argv[] = { NULL, "default", NULL };
struct option options[] = {
OPT_GROUP("update specific options"),
OPT_BOOLEAN('p', "prune", &prune,
"prune remotes after fecthing"),
OPT_END()
};


argc = parse_options(argc, argv, options, builtin_remote_usage,
PARSE_OPT_KEEP_ARGV0);
if (argc < 2) { if (argc < 2) {
argc = 2; argc = 2;
argv = default_argv; argv = default_argv;
@ -1226,8 +1234,12 @@ static int update(int argc, const char **argv)
if (!result && !list.nr && argc == 2 && !strcmp(argv[1], "default")) if (!result && !list.nr && argc == 2 && !strcmp(argv[1], "default"))
result = for_each_remote(get_one_remote_for_update, &list); result = for_each_remote(get_one_remote_for_update, &list);


for (i = 0; i < list.nr; i++) for (i = 0; i < list.nr; i++) {
result |= fetch_remote(list.items[i].string); int err = fetch_remote(list.items[i].string);
result |= err;
if (!err && prune)
result |= prune_remote(list.items[i].string, 0);
}


/* all names were strdup()ed or strndup()ed */ /* all names were strdup()ed or strndup()ed */
list.strdup_strings = 1; list.strdup_strings = 1;