From: Stefan Beller <sbeller@google.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org, jrnieder@gmail.com, Jens.Lehmann@web.de,
Stefan Beller <sbeller@google.com>
Subject: [PATCHv13 2/7] submodule-config: drop check against NULL
Date: Thu, 18 Feb 2016 15:33:13 -0800 [thread overview]
Message-ID: <1455838398-12379-3-git-send-email-sbeller@google.com> (raw)
In-Reply-To: <1455838398-12379-1-git-send-email-sbeller@google.com>
Adhere to the common coding style of Git and not check explicitly
for NULL throughout the file. There are still other occurrences in the
code base but that is usually inside of conditions with side effects.
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
submodule-config.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/submodule-config.c b/submodule-config.c
index a5cd2ee..9fa2269 100644
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -267,7 +267,7 @@ static int parse_config(const char *var, const char *value, void *data)
if (!strcmp(item.buf, "path")) {
if (!value)
ret = config_error_nonbool(var);
- else if (!me->overwrite && submodule->path != NULL)
+ else if (!me->overwrite && submodule->path)
warn_multiple_config(me->commit_sha1, submodule->name,
"path");
else {
@@ -291,7 +291,7 @@ static int parse_config(const char *var, const char *value, void *data)
} else if (!strcmp(item.buf, "ignore")) {
if (!value)
ret = config_error_nonbool(var);
- else if (!me->overwrite && submodule->ignore != NULL)
+ else if (!me->overwrite && submodule->ignore)
warn_multiple_config(me->commit_sha1, submodule->name,
"ignore");
else if (strcmp(value, "untracked") &&
@@ -307,7 +307,7 @@ static int parse_config(const char *var, const char *value, void *data)
} else if (!strcmp(item.buf, "url")) {
if (!value) {
ret = config_error_nonbool(var);
- } else if (!me->overwrite && submodule->url != NULL) {
+ } else if (!me->overwrite && submodule->url) {
warn_multiple_config(me->commit_sha1, submodule->name,
"url");
} else {
--
2.7.0.rc0.34.g65aed89
next prev parent reply other threads:[~2016-02-18 23:33 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-18 23:33 [PATCHv13 0/7] Expose submodule parallelism to the user Stefan Beller
2016-02-18 23:33 ` [PATCHv13 1/7] submodule-config: keep update strategy around Stefan Beller
2016-02-18 23:33 ` Stefan Beller [this message]
2016-02-18 23:33 ` [PATCHv13 3/7] fetching submodules: respect `submodule.fetchJobs` config option Stefan Beller
2016-02-18 23:33 ` [PATCHv13 4/7] submodule update: direct error message to stderr Stefan Beller
2016-02-18 23:33 ` [PATCHv13 5/7] git submodule update: have a dedicated helper for cloning Stefan Beller
2016-02-19 12:03 ` Jeff King
2016-02-19 16:47 ` Stefan Beller
2016-02-19 17:20 ` Eric Sunshine
2016-02-19 19:08 ` Jeff King
2016-02-19 19:10 ` Stefan Beller
2016-02-18 23:33 ` [PATCHv13 6/7] submodule update: expose parallelism to the user Stefan Beller
2016-02-18 23:33 ` [PATCHv13 7/7] clone: allow an explicit argument for parallel submodule clones Stefan Beller
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=1455838398-12379-3-git-send-email-sbeller@google.com \
--to=sbeller@google.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
/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).