Skip to contentSkip to conversation

remote: update builtin usage

PATCH In review Michael Schubert 2 participants 2 messages Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 remote: update builtin usage

Add missing options "--tags|--no-tags" and "--push".

---
 builtin/remote.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
builtin/remote.c +2 -2
index fec92bc..b5645fe 100644
@@ -9,7 +9,7 @@
 
 static const char * const builtin_remote_usage[] = {
 	"git remote [-v | --verbose]",
-	"git remote add [-t <branch>] [-m <master>] [-f] [--mirror=<fetch|push>] <name> <url>",
+	"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--mirror=<fetch|push>] <name> <url>",
 	"git remote rename <old> <new>",
 	"git remote rm <name>",
 	"git remote set-head <name> (-a | -d | <branch>)",
@@ -17,7 +17,7 @@ static const char * const builtin_remote_usage[] = {
 	"git remote prune [-n | --dry-run] <name>",
 	"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]",
 	"git remote set-branches [--add] <name> <branch>...",
-	"git remote set-url <name> <newurl> [<oldurl>]",
+	"git remote set-url [--push] <name> <newurl> [<oldurl>]",
 	"git remote set-url --add <name> <newurl>",
 	"git remote set-url --delete <name> <url>",
 	NULL
Signature · 1 line
1.7.10.dirty
#1 lore raw
Quoted 21 lines · Michael Schubert

Add missing options "--tags|--no-tags" and "--push".

---
 builtin/remote.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
builtin/remote.c +1 -1
index fec92bc..b5645fe 100644
@@ -9,7 +9,7 @@
 
 static const char * const builtin_remote_usage[] = {
 	"git remote [-v | --verbose]",
-	"git remote add [-t <branch>] [-m <master>] [-f] [--mirror=<fetch|push>] <name> <url>",
+	"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--mirror=<fetch|push>] <name> <url>",
 	"git remote rename <old> <new>",
 	"git remote rm <name>",
 	"git remote set-head <name> (-a | -d | <branch>)",

builtin/remote.c static const char * const builtin_remote_usage[] = { · line 23

Quoted 8 lines
builtin/remote.c +1 -1
@@ -17,7 +17,7 @@ static const char * const builtin_remote_usage[] = {
 	"git remote prune [-n | --dry-run] <name>",
 	"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]",
 	"git remote set-branches [--add] <name> <branch>...",
-	"git remote set-url <name> <newurl> [<oldurl>]",
+	"git remote set-url [--push] <name> <newurl> [<oldurl>]",
 	"git remote set-url --add <name> <newurl>",
 	"git remote set-url --delete <name> <url>",
 	NULL

Hrm. While this may not be _wrong_ per-se, it strikes me odd that builtin_remote_usage[] is more or less a superset of the subcommand specific usage text, e.g. builtin_remote_seturl_usage[], etc., but still need to be manually defined like this. That always leaves a risk that the descriptions would drift apart between the two places.

For example, builtin_remote_setbranches_usage[] has these two:

static const char * const builtin_remote_setbranches_usage[] = {
"git remote set-branches <name> <branch>...", "git remote set-branches --add <name> <branch>...", NULL
};

where the above has only one, with an optional "[--add]".

There must be a better way to do this.