Git development
 help / color / mirror / Atom feed
* [PATCH] remote: fix remote set-url usage
@ 2011-11-07  3:36 Felipe Contreras
  2011-11-07  4:34 ` Junio C Hamano
  2011-11-07  5:12 ` Junio C Hamano
  0 siblings, 2 replies; 5+ messages in thread
From: Felipe Contreras @ 2011-11-07  3:36 UTC (permalink / raw)
  To: git; +Cc: Felipe Contreras

Bad copy-paste.

Otherwise the help would be for a different command:
 git remote set-url --help

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 builtin/remote.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/builtin/remote.c b/builtin/remote.c
index e1285be..2add79a 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -1427,7 +1427,7 @@ static int set_url(int argc, const char **argv)
 			    "delete URLs"),
 		OPT_END()
 	};
-	argc = parse_options(argc, argv, NULL, options, builtin_remote_update_usage,
+	argc = parse_options(argc, argv, NULL, options, builtin_remote_seturl_usage,
 			     PARSE_OPT_KEEP_ARGV0);
 
 	if (add_mode && delete_mode)
-- 
1.7.7

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH] remote: fix remote set-url usage
  2011-11-07  3:36 [PATCH] remote: fix remote set-url usage Felipe Contreras
@ 2011-11-07  4:34 ` Junio C Hamano
  2011-11-07  5:12 ` Junio C Hamano
  1 sibling, 0 replies; 5+ messages in thread
From: Junio C Hamano @ 2011-11-07  4:34 UTC (permalink / raw)
  To: Felipe Contreras; +Cc: git

Good eyes; thanks.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] remote: fix remote set-url usage
  2011-11-07  3:36 [PATCH] remote: fix remote set-url usage Felipe Contreras
  2011-11-07  4:34 ` Junio C Hamano
@ 2011-11-07  5:12 ` Junio C Hamano
  2011-11-07  5:44   ` Junio C Hamano
  2011-11-07  9:48   ` Jonathan Nieder
  1 sibling, 2 replies; 5+ messages in thread
From: Junio C Hamano @ 2011-11-07  5:12 UTC (permalink / raw)
  To: Felipe Contreras; +Cc: git, Jonathan Nieder

Felipe Contreras <felipe.contreras@gmail.com> writes:

> Bad copy-paste.
>
> Otherwise the help would be for a different command:
>  git remote set-url --help
>
> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
> ---

Doesn't the same thing apply to set-branches?

 builtin/remote.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/builtin/remote.c b/builtin/remote.c
index c4d17b5..06741ec 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -1336,7 +1336,7 @@ static int set_branches(int argc, const char **argv)
 			     builtin_remote_setbranches_usage, 0);
 	if (argc == 0) {
 		error("no remote specified");
-		usage_with_options(builtin_remote_seturl_usage, options);
+		usage_with_options(builtin_remote_setbranches_usage, options);
 	}
 	argv[argc] = NULL;
 

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH] remote: fix remote set-url usage
  2011-11-07  5:12 ` Junio C Hamano
@ 2011-11-07  5:44   ` Junio C Hamano
  2011-11-07  9:48   ` Jonathan Nieder
  1 sibling, 0 replies; 5+ messages in thread
From: Junio C Hamano @ 2011-11-07  5:44 UTC (permalink / raw)
  To: git; +Cc: Felipe Contreras, Jonathan Nieder

By the way, these two are low-impact fixes to relatively ancient problems,
so while it is not urgent enough to include them to the upcoming 1.7.8
(the users lived with the bug long enough and survived), I do not see much
problem to include them in it, either.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] remote: fix remote set-url usage
  2011-11-07  5:12 ` Junio C Hamano
  2011-11-07  5:44   ` Junio C Hamano
@ 2011-11-07  9:48   ` Jonathan Nieder
  1 sibling, 0 replies; 5+ messages in thread
From: Jonathan Nieder @ 2011-11-07  9:48 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: Felipe Contreras, git

Junio C Hamano wrote:

> --- a/builtin/remote.c
> +++ b/builtin/remote.c
> @@ -1336,7 +1336,7 @@ static int set_branches(int argc, const char **argv)
>  			     builtin_remote_setbranches_usage, 0);
>  	if (argc == 0) {
>  		error("no remote specified");
> -		usage_with_options(builtin_remote_seturl_usage, options);
> +		usage_with_options(builtin_remote_setbranches_usage, options);

Good eyes.  Thanks for catching it.

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2011-11-07  9:48 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-07  3:36 [PATCH] remote: fix remote set-url usage Felipe Contreras
2011-11-07  4:34 ` Junio C Hamano
2011-11-07  5:12 ` Junio C Hamano
2011-11-07  5:44   ` Junio C Hamano
2011-11-07  9:48   ` Jonathan Nieder

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox