threads / patch / 16364

patch, 2 partsremote short help message updated

Subject: [PATCH 1/2] remote short help message updated

## tl;dr

4 messages between Nov 17, 2008 and Nov 17, 2008. Diffs are folded; open one to read it.

replies: 3people: 2as markdown or json

crquan@gmail.com· Nov 17, 2008, 09:12 UTC · lore
From: Cheng Renquan <crquan@gmail.com>
Synced from git help remote.
Signed-off-by: Cheng Renquan <crquan@gmail.com>
---
 builtin-remote.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
Show changes to builtin-remote.c +4 −4
diff --git a/builtin-remote.c b/builtin-remote.c
index 71696b5..d032f25 100644
--- a/builtin-remote.c
+++ b/builtin-remote.c
@@ -8,12 +8,12 @@
 #include "refs.h"
 
 static const char * const builtin_remote_usage[] = {
-	"git remote",
-	"git remote add <name> <url>",
+	"git remote [-v | --verbose]",
+	"git remote add [-t <branch>] [-m <master>] [-f] [--mirror] <name> <url>",
 	"git remote rename <old> <new>",
 	"git remote rm <name>",
-	"git remote show <name>",
-	"git remote prune <name>",
+	"git remote show [-n] <name>",
+	"git remote prune [-n | --dry-run] <name>",
 	"git remote update [group]",
 	NULL
 };
-- 
1.6.0.2
crquan@gmail.com· Nov 17, 2008, 09:12 UTC · re: crquan@gmail.com · lore

[PATCH 2/2] git-remote: add verbose mode

From: Denis ChengRq <crquan@gmail.com>
Signed-off-by: Cheng Renquan <crquan@gmail.com>
---
 builtin-remote.c |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)
Show changes to builtin-remote.c +13 −6
diff --git a/builtin-remote.c b/builtin-remote.c
index d032f25..8a9f4b5 100644
--- a/builtin-remote.c
+++ b/builtin-remote.c
@@ -14,7 +14,7 @@ static const char * const builtin_remote_usage[] = {
 	"git remote rm <name>",
 	"git remote show [-n] <name>",
 	"git remote prune [-n | --dry-run] <name>",
-	"git remote update [group]",
+	"git remote update [-v | --verbose] [group]",
 	NULL
 };
 
@@ -40,10 +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 };
-	printf("Updating %s\n", name);
+	if (verbose)
+		printf("Updating %s (%s)\n", name, url);
+	else
+		printf("Updating %s\n", name);
 	if (run_command_v_opt(argv, RUN_GIT_CMD))
 		return error("Could not fetch %s", name);
 	return 0;
@@ -117,7 +120,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 +772,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 +825,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
Junio C Hamano· Nov 17, 2008, 10:15 UTC · re: crquan@gmail.com · lore

Re: [PATCH 2/2] git-remote: add verbose mode

crquan@gmail.com writes:
> From: Denis ChengRq <crquan@gmail.com>
>
> Signed-off-by: Cheng Renquan <crquan@gmail.com>

Your other one (I am assuming the other one is also from you) has "From: Cheng Renquan <crquan@gmail.com>" and this is "From: Denis ChengRq <crquan@gmail.com>". We'd prefer to keep the same person under a single name in "git shortlog" list. Under which name do you want to be known?

Please describe in what sense this is "verbose", iow, what additional information is added by this patch, in your proposed commit log message.

Show 11 quoted lines
> @@ -40,10 +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 };
> -	printf("Updating %s\n", name);
> +	if (verbose)
> +		printf("Updating %s (%s)\n", name, url);

Are you guaranteeing that url is not NULL at this point in the code? If so how?

How does this "--verbose" command the users give "git remote" relate to the "--verbose" option the underlying "git fetch" has? IOW, do you tell "git fetch" to be verbose as well? If so, how? If not, why not?

Junio C Hamano· Nov 17, 2008, 10:15 UTC · re: crquan@gmail.com · lore

Re: [PATCH 1/2] remote short help message updated

crquan@gmail.com writes:
Show 5 quoted lines
> From: Cheng Renquan <crquan@gmail.com>
>
> Synced from git help remote.
>
> Signed-off-by: Cheng Renquan <crquan@gmail.com>
We strongly prefer writing commit log message in imperative mood, like:
	[PATCH] git-remote: match usage string with the manual pages
The patch itself looks good.  Thanks.

← back to recent threads