a36a822d7d
Using the show_usage_if_asked() helper we introduced earlier, fix callers of usage() that want to show the help text when explicitly asked by the end-user. The help text now goes to the standard output stream for them. The callers in this step are oddballs in that their invocations of usage() are *not* guarded by if (argc == 2 && !strcmp(argv[1], "-h") usage(...); There are (unnecessarily) being clever ones that do things like if (argc != 2 || !strcmp(argv[1], "-h") usage(...); to say "I know I take only one argument, so argc != 2 is always an error regardless of what is in argv[]. Ah, by the way, even if argc is 2, "-h" is a request for usage text, so we do the same". Some like "git var -h" just do not treat "-h" any specially, and let it take the same error code paths as a parameter error. Now we cannot do the same, so these callers are rewrittin to do the show_usage_and_exit_if_asked() first and then handle the usage error the way they used to. Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
52 lines
1.2 KiB
C
52 lines
1.2 KiB
C
#define USE_THE_REPOSITORY_VARIABLE
|
|
|
|
#include "git-compat-util.h"
|
|
#include "credential.h"
|
|
#include "builtin.h"
|
|
#include "config.h"
|
|
|
|
static const char usage_msg[] =
|
|
"git credential (fill|approve|reject)";
|
|
|
|
int cmd_credential(int argc,
|
|
const char **argv,
|
|
const char *prefix UNUSED,
|
|
struct repository *repo UNUSED)
|
|
{
|
|
const char *op;
|
|
struct credential c = CREDENTIAL_INIT;
|
|
|
|
git_config(git_default_config, NULL);
|
|
|
|
show_usage_if_asked(argc, argv, usage_msg);
|
|
if (argc != 2)
|
|
usage(usage_msg);
|
|
op = argv[1];
|
|
|
|
if (!strcmp(op, "capability")) {
|
|
credential_set_all_capabilities(&c, CREDENTIAL_OP_INITIAL);
|
|
credential_announce_capabilities(&c, stdout);
|
|
return 0;
|
|
}
|
|
|
|
if (credential_read(&c, stdin, CREDENTIAL_OP_INITIAL) < 0)
|
|
die("unable to read credential from stdin");
|
|
|
|
if (!strcmp(op, "fill")) {
|
|
credential_fill(&c, 0);
|
|
credential_next_state(&c);
|
|
credential_write(&c, stdout, CREDENTIAL_OP_RESPONSE);
|
|
} else if (!strcmp(op, "approve")) {
|
|
credential_set_all_capabilities(&c, CREDENTIAL_OP_HELPER);
|
|
credential_approve(&c);
|
|
} else if (!strcmp(op, "reject")) {
|
|
credential_set_all_capabilities(&c, CREDENTIAL_OP_HELPER);
|
|
credential_reject(&c);
|
|
} else {
|
|
usage(usage_msg);
|
|
}
|
|
|
|
credential_clear(&c);
|
|
return 0;
|
|
}
|