[PATCH 4/8] remote-{ext,fd}: print usage message on invalid arguments
- From
Jeff King <peff@peff.net>
- Date
- May 30, 2017, 05:15 UTC
- Message-ID
- <20170530051509.fx35y7d67b7fev6y@sigill.intra.peff.net>
- In-Reply-To
- <20170530050949.dkgu3u26qj6ycusy@sigill.intra.peff.net>
We just say "Expected two arguments" when we get a different number of arguments, but we can be slightly friendlier. People shouldn't generally be running remote helpers themselves, but curious users might say "git remote-ext -h".
Signed-off-by: Jeff King <peff@peff.net> --- According to remote-curl.c, we should actually handle the 1-argument case, too. I didn't dig into that because it's orthogonal to this series, and it's not clear that anybody cares.
builtin/remote-ext.c | 5 ++++- builtin/remote-fd.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/builtin/remote-ext.c b/builtin/remote-ext.c index 11b48bfb4..bfb21ba7d 100644 --- a/builtin/remote-ext.c +++ b/builtin/remote-ext.c @@ -3,6 +3,9 @@ #include "run-command.h" #include "pkt-line.h" +static const char usage_msg[] = + "git remote-ext <remote> <url>"; + /* * URL syntax: * 'command [arg1 [arg2 [...]]]' Invoke command with given arguments. @@ -193,7 +196,7 @@ static int command_loop(const char *child) int cmd_remote_ext(int argc, const char **argv, const char *prefix) { if (argc != 3) - die("Expected two arguments"); + usage(usage_msg); return command_loop(argv[2]); } diff --git a/builtin/remote-fd.c b/builtin/remote-fd.c index 08d7121b6..91dfe07e0 100644 --- a/builtin/remote-fd.c +++ b/builtin/remote-fd.c @@ -1,6 +1,9 @@ #include "builtin.h" #include "transport.h" +static const char usage_msg[] = + "git remote-fd <remote> <url>"; + /* * URL syntax: * 'fd::<inoutfd>[/<anything>]' Read/write socket pair @@ -57,7 +60,7 @@ int cmd_remote_fd(int argc, const char **argv, const char *prefix) char *end; if (argc != 3) - die("Expected two arguments"); + usage(usage_msg); input_fd = (int)strtoul(argv[2], &end, 10);
-- 2.13.0.613.g11c956365