From: Matthieu Moy <Matthieu.Moy@imag.fr>
To: git@vger.kernel.org, gitster@pobox.com
Cc: artagnon@gmail.com, tanayabh@gmail.com,
Matthieu Moy <Matthieu.Moy@imag.fr>
Subject: [PATCH 2/3] fixup for patch 2: actually check the return value
Date: Wed, 16 Jul 2014 18:09:11 +0200 [thread overview]
Message-ID: <1405526952-25019-2-git-send-email-Matthieu.Moy@imag.fr> (raw)
In-Reply-To: <1405526952-25019-1-git-send-email-Matthieu.Moy@imag.fr>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
---
I won't fight for this, but I think it makes sense.
t/t1308-config-set.sh | 4 ++--
test-config.c | 10 ++++++----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/t/t1308-config-set.sh b/t/t1308-config-set.sh
index ea031bf..f0307b7 100755
--- a/t/t1308-config-set.sh
+++ b/t/t1308-config-set.sh
@@ -168,7 +168,7 @@ test_expect_success 'find value_list for a key from a configset' '
'
test_expect_success 'proper error on non-existant files' '
- echo "Error reading configuration file non-existant-file." >expect &&
+ echo "Error (-1) reading configuration file non-existant-file." >expect &&
test_expect_code 2 test-config configset_get_value foo.bar non-existant-file 2>actual &&
test_cmp expect actual
'
@@ -176,7 +176,7 @@ test_expect_success 'proper error on non-existant files' '
test_expect_success 'proper error on non-accessible files' '
chmod -r .git/config &&
test_when_finished "chmod +r .git/config" &&
- echo "Error reading configuration file .git/config." >expect &&
+ echo "Error (-1) reading configuration file .git/config." >expect &&
test_expect_code 2 test-config configset_get_value foo.bar .git/config 2>actual &&
test_cmp expect actual
'
diff --git a/test-config.c b/test-config.c
index cad35f4..9dd1b22 100644
--- a/test-config.c
+++ b/test-config.c
@@ -86,8 +86,9 @@ int main(int argc, char **argv)
}
} else if (!strcmp(argv[1], "configset_get_value")) {
for (i = 3; i < argc; i++) {
- if (git_configset_add_file(&cs, argv[i])) {
- fprintf(stderr, "Error reading configuration file %s.\n", argv[i]);
+ int err;
+ if ((err = git_configset_add_file(&cs, argv[i]))) {
+ fprintf(stderr, "Error (%d) reading configuration file %s.\n", err, argv[i]);
goto exit2;
}
}
@@ -103,8 +104,9 @@ int main(int argc, char **argv)
}
} else if (!strcmp(argv[1], "configset_get_value_multi")) {
for (i = 3; i < argc; i++) {
- if (git_configset_add_file(&cs, argv[i])) {
- fprintf(stderr, "Error reading configuration file %s.\n", argv[i]);
+ int err;
+ if ((err = git_configset_add_file(&cs, argv[i]))) {
+ fprintf(stderr, "Error (%d) reading configuration file %s.\n", err, argv[i]);
goto exit2;
}
}
--
2.0.0.262.gdafc651
next prev parent reply other threads:[~2014-07-16 16:11 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-15 14:29 [PATCH v9 0/3] git config cache & special querying api utilizing the cache Tanay Abhra
2014-07-15 14:29 ` [PATCH v9 1/2] add `config_set` API for caching config-like files Tanay Abhra
2014-07-15 15:46 ` Junio C Hamano
2014-07-15 16:22 ` Tanay Abhra
2014-07-16 11:41 ` [PATCH v9r1 " Tanay Abhra
2014-07-15 14:29 ` [PATCH v9 2/2] test-config: add tests for the config_set API Tanay Abhra
2014-07-15 15:57 ` Junio C Hamano
2014-07-15 17:07 ` Tanay Abhra
2014-07-15 18:26 ` Junio C Hamano
2014-07-16 11:44 ` [PATCH v9r1 " Tanay Abhra
2014-07-16 11:49 ` Matthieu Moy
2014-07-16 12:22 ` [PATCH v9r2 1/2] add `config_set` API for caching config-like files Tanay Abhra
2014-07-16 16:06 ` Matthieu Moy
2014-07-16 16:09 ` [PATCH 1/3] fixup for patch 2: minor style fix Matthieu Moy
2014-07-16 16:09 ` Matthieu Moy [this message]
2014-07-16 16:55 ` [PATCH 2/3] fixup for patch 2: actually check the return value Tanay Abhra
2014-07-16 17:10 ` Matthieu Moy
2014-07-16 16:09 ` [PATCH 3/3] fixup for patch 1: typo Matthieu Moy
2014-07-16 16:44 ` [PATCH v9r2 1/2] add `config_set` API for caching config-like files Tanay Abhra
2014-07-16 17:06 ` Matthieu Moy
[not found] ` <53C6C2BD.3030703@gmail.com>
2014-07-17 10:01 ` Matthieu Moy
2014-07-17 11:06 ` Tanay Abhra
2014-07-17 11:34 ` Matthieu Moy
2014-07-17 11:13 ` Matthieu Moy
2014-07-17 17:12 ` Junio C Hamano
2014-07-16 12:22 ` [PATCH v9r2 2/2] test-config: add tests for the config_set API Tanay Abhra
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1405526952-25019-2-git-send-email-Matthieu.Moy@imag.fr \
--to=matthieu.moy@imag.fr \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=tanayabh@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.
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 NNTP newsgroup(s).