[PATCH 2/3] rev-parse: put all options under the "-" check
- From
Jeff King <peff@peff.net>
- Date
- Nov 10, 2020, 21:38 UTC
- Message-ID
- <20201110213803.GB788740@coredump.intra.peff.net>
- In-Reply-To
- <20201110213544.GA3263091@coredump.intra.peff.net>
The option-parsing loop of rev-parse checks whether the first character of an arg is "-". If so, then it enters a series of conditionals checking for individual options. But some options are inexplicably outside of that outer conditional.
This doesn't produce the wrong behavior; the conditional is actually redundant with the individual option checks, and it's really only its fallback "continue" that we care about. But we should at least be consistent.
One obvious alternative is that we could get rid of the conditional entirely. But we'll be using the extra block it provides in the next patch.
Signed-off-by: Jeff King <peff@peff.net> --- builtin/rev-parse.c | 47 ++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 24 deletions(-)
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c index 293428fa0d..79689286d8 100644 --- a/builtin/rev-parse.c +++ b/builtin/rev-parse.c @@ -652,30 +652,6 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix) did_repo_setup = 1; } - if (!strcmp(arg, "--git-path")) { - if (!argv[i + 1]) - die("--git-path requires an argument"); - strbuf_reset(&buf); - puts(relative_path(git_path("%s", argv[i + 1]), - prefix, &buf)); - i++; - continue; - } - if (!strcmp(arg,"-n")) { - if (++i >= argc) - die("-n requires an argument"); - if ((filter & DO_FLAGS) && (filter & DO_REVS)) { - show(arg); - show(argv[i]); - } - continue; - } - if (starts_with(arg, "-n")) { - if ((filter & DO_FLAGS) && (filter & DO_REVS)) - show(arg); - continue; - } - if (*arg == '-') { if (!strcmp(arg, "--")) { as_is = 2; @@ -684,6 +660,29 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix) show_file(arg, 0); continue; } + if (!strcmp(arg, "--git-path")) { + if (!argv[i + 1]) + die("--git-path requires an argument"); + strbuf_reset(&buf); + puts(relative_path(git_path("%s", argv[i + 1]), + prefix, &buf)); + i++; + continue; + } + if (!strcmp(arg,"-n")) { + if (++i >= argc) + die("-n requires an argument"); + if ((filter & DO_FLAGS) && (filter & DO_REVS)) { + show(arg); + show(argv[i]); + } + continue; + } + if (starts_with(arg, "-n")) { + if ((filter & DO_FLAGS) && (filter & DO_REVS)) + show(arg); + continue; + } if (!strcmp(arg, "--default")) { def = argv[++i]; if (!def)
-- 2.29.2.640.g9e24689a4c