From: crquan@gmail.com Date: Mon, 17 Nov 2008 11:15:50 GMT Subject: [PATCH 2/3] git-remote: add verbose mode to git remote update Message-ID: <1226920551-28303-2-git-send-email-crquan@gmail.com> In-Reply-To: <1226920551-28303-1-git-send-email-crquan@gmail.com> From: Cheng Renquan Pass the verbose mode parameter to the underlying fetch command. $ ./git remote -v update Updating origin From git://git.kernel.org/pub/scm/git/git = [up to date] html -> origin/html = [up to date] maint -> origin/maint = [up to date] man -> origin/man = [up to date] master -> origin/master = [up to date] next -> origin/next = [up to date] pu -> origin/pu = [up to date] todo -> origin/todo Signed-off-by: Cheng Renquan --- builtin-remote.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/builtin-remote.c b/builtin-remote.c index d032f25..fff9920 100644 --- a/builtin-remote.c +++ b/builtin-remote.c @@ -14,7 +14,7 @@ static const char * const builtin_remote_usage[] = { "git remote rm ", "git remote show [-n] ", "git remote prune [-n | --dry-run] ", - "git remote update [group]", + "git remote update [-v | --verbose] [group]", NULL }; @@ -40,9 +40,13 @@ static int opt_parse_track(const struct option *opt, const char *arg, int not) return 0; } -static int fetch_remote(const char *name) +static int fetch_remote(const char *name, const char *url) { - const char *argv[] = { "fetch", name, NULL }; + const char *argv[] = { "fetch", name, NULL, NULL }; + if (verbose) { + argv[1] = "-v"; + argv[2] = name; + } printf("Updating %s\n", name); if (run_command_v_opt(argv, RUN_GIT_CMD)) return error("Could not fetch %s", name); @@ -117,7 +121,7 @@ static int add(int argc, const char **argv) return 1; } - if (fetch && fetch_remote(name)) + if (fetch && fetch_remote(name, url)) return 1; if (master) { @@ -769,8 +773,12 @@ static int prune(int argc, const char **argv) static int get_one_remote_for_update(struct remote *remote, void *priv) { struct string_list *list = priv; + if (!remote->skip_default_update) - string_list_append(xstrdup(remote->name), list); + string_list_append(remote->name, list)->util = + remote->url_nr > 0 + ? (void *)remote->url[remote->url_nr-1] : NULL; + return 0; } @@ -818,7 +826,7 @@ static int update(int argc, const char **argv) result = for_each_remote(get_one_remote_for_update, &list); for (i = 0; i < list.nr; i++) - result |= fetch_remote(list.items[i].string); + result |= fetch_remote(list.items[i].string, list.items[i].util); /* all names were strdup()ed or strndup()ed */ list.strdup_strings = 1; -- 1.6.0.2