From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>, Shawn Pearce <spearce@spearce.org>
Subject: [PATCH v3 4/8] parse_fetch_refspec(): clarify the codeflow a bit
Date: Wed, 30 Jan 2013 10:45:38 -0800 [thread overview]
Message-ID: <1359571542-19852-5-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <1359571542-19852-1-git-send-email-gitster@pobox.com>
Most parts of the cascaded if/else if/... checked an allowable
condition but some checked forbidden conditions. This makes adding
new allowable conditions unnecessarily inconvenient.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
remote.c | 29 ++++++++++++-----------------
1 file changed, 12 insertions(+), 17 deletions(-)
diff --git a/remote.c b/remote.c
index 4b1153f..1b7828d 100644
--- a/remote.c
+++ b/remote.c
@@ -538,7 +538,7 @@ static struct refspec *parse_refspec_internal(int nr_refspec, const char **refsp
/*
* Before going on, special case ":" (or "+:") as a refspec
- * for matching refs.
+ * for pushing matching refs.
*/
if (!fetch && rhs == lhs && rhs[1] == '\0') {
rs[i].matching = 1;
@@ -565,26 +565,21 @@ static struct refspec *parse_refspec_internal(int nr_refspec, const char **refsp
flags = REFNAME_ALLOW_ONELEVEL | (is_glob ? REFNAME_REFSPEC_PATTERN : 0);
if (fetch) {
- /*
- * LHS
- * - empty is allowed; it means HEAD.
- * - otherwise it must be a valid looking ref.
- */
+ /* LHS */
if (!*rs[i].src)
- ; /* empty is ok */
- else if (check_refname_format(rs[i].src, flags))
+ ; /* empty is ok; it means "HEAD" */
+ else if (!check_refname_format(rs[i].src, flags))
+ ; /* valid looking ref is ok */
+ else
goto invalid;
- /*
- * RHS
- * - missing is ok, and is same as empty.
- * - empty is ok; it means not to store.
- * - otherwise it must be a valid looking ref.
- */
+ /* RHS */
if (!rs[i].dst)
- ; /* ok */
+ ; /* missing is ok; it is the same as empty */
else if (!*rs[i].dst)
- ; /* ok */
- else if (check_refname_format(rs[i].dst, flags))
+ ; /* empty is ok; it means "do not store" */
+ else if (!check_refname_format(rs[i].dst, flags))
+ ; /* valid looking ref is ok */
+ else
goto invalid;
} else {
/*
--
1.8.1.2.589.ga9b91ac
next prev parent reply other threads:[~2013-01-30 18:46 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-30 18:45 [PATCH v3 0/8] Hiding refs Junio C Hamano
2013-01-30 18:45 ` [PATCH v3 1/8] upload-pack: share more code Junio C Hamano
2013-01-30 18:45 ` [PATCH v3 2/8] upload-pack: simplify request validation Junio C Hamano
2013-01-30 18:45 ` [PATCH v3 3/8] upload/receive-pack: allow hiding ref hierarchies Junio C Hamano
2013-02-05 8:50 ` Jeff King
2013-02-05 15:45 ` Junio C Hamano
2013-02-06 11:31 ` Jeff King
2013-02-06 15:57 ` Junio C Hamano
2013-01-30 18:45 ` Junio C Hamano [this message]
2013-01-30 18:45 ` [PATCH v3 5/8] fetch: use struct ref to represent refs to be fetched Junio C Hamano
2013-01-30 18:45 ` [PATCH v3 6/8] upload-pack: optionally allow fetching from the tips of hidden refs Junio C Hamano
2013-01-30 18:45 ` [PATCH v3 7/8] fetch: fetch objects by their exact SHA-1 object names Junio C Hamano
2013-02-05 9:19 ` Jeff King
2013-02-05 11:18 ` Jeff King
2013-02-05 15:55 ` Junio C Hamano
2013-01-30 18:45 ` [PATCH v3 8/8] WIP: receive.allowupdatestohidden Junio C Hamano
2013-02-05 8:04 ` [PATCH v3 0/8] Hiding refs Michael Haggerty
2013-02-05 8:33 ` Jonathan Nieder
2013-02-05 10:29 ` Michael Haggerty
2013-02-05 17:38 ` Junio C Hamano
2013-02-06 10:34 ` Duy Nguyen
2013-02-06 19:17 ` Junio C Hamano
2013-02-06 19:45 ` Jonathan Nieder
2013-02-06 21:50 ` Michael Haggerty
2013-02-06 22:12 ` Junio C Hamano
2013-02-06 22:26 ` Ævar Arnfjörð Bjarmason
2013-02-07 0:12 ` Junio C Hamano
2013-02-07 0:16 ` Jeff King
2013-02-07 10:30 ` Ævar Arnfjörð Bjarmason
2013-02-07 18:25 ` Junio C Hamano
2014-02-23 2:44 ` Duy Nguyen
2014-03-11 1:49 ` Jeff King
2014-03-11 19:32 ` Junio C Hamano
2014-03-11 20:05 ` Jeff King
2014-03-11 20:25 ` Junio C Hamano
2014-03-11 20:36 ` Jeff King
2014-03-14 12:37 ` Duy Nguyen
2014-03-14 16:45 ` Shawn Pearce
2014-03-14 23:30 ` Duy Nguyen
2014-03-15 0:09 ` Shawn Pearce
2014-03-18 4:17 ` Jeff King
2014-03-18 14:27 ` Duy Nguyen
2014-03-18 14:36 ` Duy Nguyen
2014-03-15 1:23 ` Duy Nguyen
2014-03-18 4:18 ` Jeff King
2013-02-06 22:56 ` Jeff King
2013-02-05 17:36 ` Junio C Hamano
2013-02-05 17:27 ` Junio C Hamano
2013-02-06 10:17 ` Michael Haggerty
2013-02-06 19:55 ` Jonathan Nieder
2013-02-06 22:01 ` Michael Haggerty
2013-02-07 15:58 ` Jed Brown
2013-02-09 23:23 ` Junio C Hamano
2013-02-10 4:45 ` Jed Brown
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=1359571542-19852-5-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=spearce@spearce.org \
/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).