From: "SZEDER Gábor" <szeder.dev@gmail.com>
To: Jeff King <peff@peff.net>, Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, "SZEDER Gábor" <szeder.dev@gmail.com>
Subject: [PATCHv2 5/5] revision.c: use skip_prefix() in handle_revision_pseudo_opt()
Date: Fri, 9 Jun 2017 20:17:33 +0200 [thread overview]
Message-ID: <20170609181733.6793-6-szeder.dev@gmail.com> (raw)
In-Reply-To: <20170609181733.6793-1-szeder.dev@gmail.com>
Instead of starts_with() and a bunch of magic numbers.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
---
revision.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/revision.c b/revision.c
index c99c47c50..12a44189e 100644
--- a/revision.c
+++ b/revision.c
@@ -2135,20 +2135,20 @@ static int handle_revision_pseudo_opt(const char *submodule,
} else if ((argcount = parse_long_opt("exclude", argv, &optarg))) {
add_ref_exclusion(&revs->ref_excludes, optarg);
return argcount;
- } else if (starts_with(arg, "--branches=")) {
+ } else if (skip_prefix(arg, "--branches=", &optarg)) {
struct all_refs_cb cb;
init_all_refs_cb(&cb, revs, *flags);
- for_each_glob_ref_in(handle_one_ref, arg + 11, "refs/heads/", &cb);
+ for_each_glob_ref_in(handle_one_ref, optarg, "refs/heads/", &cb);
clear_ref_exclusion(&revs->ref_excludes);
- } else if (starts_with(arg, "--tags=")) {
+ } else if (skip_prefix(arg, "--tags=", &optarg)) {
struct all_refs_cb cb;
init_all_refs_cb(&cb, revs, *flags);
- for_each_glob_ref_in(handle_one_ref, arg + 7, "refs/tags/", &cb);
+ for_each_glob_ref_in(handle_one_ref, optarg, "refs/tags/", &cb);
clear_ref_exclusion(&revs->ref_excludes);
- } else if (starts_with(arg, "--remotes=")) {
+ } else if (skip_prefix(arg, "--remotes=", &optarg)) {
struct all_refs_cb cb;
init_all_refs_cb(&cb, revs, *flags);
- for_each_glob_ref_in(handle_one_ref, arg + 10, "refs/remotes/", &cb);
+ for_each_glob_ref_in(handle_one_ref, optarg, "refs/remotes/", &cb);
clear_ref_exclusion(&revs->ref_excludes);
} else if (!strcmp(arg, "--reflog")) {
add_reflogs_to_pending(revs, *flags);
@@ -2158,14 +2158,14 @@ static int handle_revision_pseudo_opt(const char *submodule,
*flags ^= UNINTERESTING | BOTTOM;
} else if (!strcmp(arg, "--no-walk")) {
revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
- } else if (starts_with(arg, "--no-walk=")) {
+ } else if (skip_prefix(arg, "--no-walk=", &optarg)) {
/*
* Detached form ("--no-walk X" as opposed to "--no-walk=X")
* not allowed, since the argument is optional.
*/
- if (!strcmp(arg + 10, "sorted"))
+ if (!strcmp(optarg, "sorted"))
revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
- else if (!strcmp(arg + 10, "unsorted"))
+ else if (!strcmp(optarg, "unsorted"))
revs->no_walk = REVISION_WALK_NO_WALK_UNSORTED;
else
return error("invalid argument to --no-walk");
--
2.13.0.420.g54001f015
next prev parent reply other threads:[~2017-06-09 18:18 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-02 19:10 [PATCH 0/3] Use skip_prefix() in handle_revision_{,pseudo_}opt() SZEDER Gábor
2017-06-02 19:10 ` [PATCH 1/3] revision.c: stricter parsing of '--no-{min,max}-parents' SZEDER Gábor
2017-06-02 19:10 ` [PATCH 2/3] revision.c: use skip_prefix() in handle_revision_opt() SZEDER Gábor
2017-06-02 20:11 ` Jeff King
2017-06-02 20:15 ` Jeff King
2017-06-09 18:17 ` SZEDER Gábor
2017-06-09 18:17 ` [PATCHv2 1/5] revision.h: turn rev_info.early_output back into an unsigned int SZEDER Gábor
2017-06-10 6:41 ` Jeff King
2017-06-10 11:41 ` [PATCHv2.1] " SZEDER Gábor
2017-06-12 21:30 ` Jeff King
2017-06-12 20:36 ` [PATCHv2 1/5] " Junio C Hamano
2017-06-12 21:59 ` Jeff King
2017-06-13 0:50 ` Jeff King
2017-06-09 18:17 ` [PATCHv2 2/5] revision.c: stricter parsing of '--no-{min,max}-parents' SZEDER Gábor
2017-06-09 18:17 ` [PATCHv2 3/5] revision.c: stricter parsing of '--early-output' SZEDER Gábor
2017-06-10 4:52 ` Junio C Hamano
2017-06-09 18:17 ` [PATCHv2 4/5] revision.c: use skip_prefix() in handle_revision_opt() SZEDER Gábor
2017-06-09 18:17 ` SZEDER Gábor [this message]
2017-06-10 6:35 ` [PATCH 2/3] " Jeff King
2017-06-10 6:44 ` Jeff King
2017-06-02 19:10 ` [PATCH 3/3] revision.c: use skip_prefix() in handle_revision_pseudo_opt() SZEDER Gábor
2017-06-02 20:17 ` [PATCH 0/3] Use skip_prefix() in handle_revision_{,pseudo_}opt() Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170609181733.6793-6-szeder.dev@gmail.com \
--to=szeder.dev@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).