зеркало из https://github.com/microsoft/git.git
revert: use OPT_NOOP_NOARG
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
6acec0380b
Коммит
7cfc60576a
|
@ -72,12 +72,10 @@ static int option_parse_x(const struct option *opt,
|
|||
static void parse_args(int argc, const char **argv)
|
||||
{
|
||||
const char * const * usage_str = revert_or_cherry_pick_usage();
|
||||
int noop;
|
||||
struct option options[] = {
|
||||
OPT_BOOLEAN('n', "no-commit", &no_commit, "don't automatically commit"),
|
||||
OPT_BOOLEAN('e', "edit", &edit, "edit the commit message"),
|
||||
{ OPTION_BOOLEAN, 'r', NULL, &noop, NULL, "no-op (backward compatibility)",
|
||||
PARSE_OPT_NOARG | PARSE_OPT_HIDDEN, NULL, 0 },
|
||||
OPT_NOOP_NOARG('r', NULL),
|
||||
OPT_BOOLEAN('s', "signoff", &signoff, "add Signed-off-by:"),
|
||||
OPT_INTEGER('m', "mainline", &mainline, "parent number"),
|
||||
OPT_RERERE_AUTOUPDATE(&allow_rerere_auto),
|
||||
|
|
Загрузка…
Ссылка в новой задаче