[PATCH 2/8] credential: handle invalid arguments earlier
- From
Jeff King <peff@peff.net>
- Date
- May 30, 2017, 05:12 UTC
- Message-ID
- <20170530051233.3nqjtrxtokoudkww@sigill.intra.peff.net>
- In-Reply-To
- <20170530050949.dkgu3u26qj6ycusy@sigill.intra.peff.net>
The git-credential command only takes one argument: the operation to perform. If we don't have one, we complain immediately. But if we have one that we don't recognize, we don't notice until after we've read the credential from stdin. This is likely to confuse a user invoking "git credential -h", as the program will hang waiting for their input before showing anything.
Let's detect this case early. Likewise, we never noticed when there are extra arguments beyond the one we're expecting. Let's catch this with the same conditional.
Note that we don't need to handle "--help" similarly, because the git wrapper does this before even calling cmd_credential().
Signed-off-by: Jeff King <peff@peff.net> --- builtin/credential.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/credential.c b/builtin/credential.c index 0412fa00f..879acfbcd 100644 --- a/builtin/credential.c +++ b/builtin/credential.c @@ -10,9 +10,9 @@ int cmd_credential(int argc, const char **argv, const char *prefix) const char *op; struct credential c = CREDENTIAL_INIT; - op = argv[1]; - if (!op) + if (argc != 2 || !strcmp(argv[1], "-h")) usage(usage_msg); + op = argv[1]; if (credential_read(&c, stdin) < 0) die("unable to read credential from stdin");
-- 2.13.0.613.g11c956365