In the first case, we already correctly return -1 if fopen() fails to
open. But we should report something so people know what's wrong.
In the second case, config_file == NULL does not necessarily mean "no
config file". Bail out if needed.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclo...@gmail.com>
---
config.c | 5 ++++-
t/t1308-config-set.sh | 4 +++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/config.c b/config.c
index b4a3205da3..e54d99d519 100644
--- a/config.c
+++ b/config.c
@@ -1422,7 +1422,7 @@ int git_config_from_file(config_fn_t fn, const char
*filename, void *data)
int ret = -1;
FILE *f;
- f = fopen(filename, "r");
+ f = fopen_or_warn(filename, "r");
if (f) {
flockfile(f);
ret = do_config_from_file(fn, CONFIG_ORIGIN_FILE, filename,
filename, f, data);
@@ -2640,6 +2640,9 @@ int git_config_rename_section_in_file(const char
*config_filename,
}
if (!(config_file = fopen(config_filename, "rb"))) {
+ ret = warn_on_fopen_errors(config_filename);
+ if (ret)
+ goto out;
/* no config file means nothing to rename, no error */
goto commit_and_out;
}
diff --git a/t/t1308-config-set.sh b/t/t1308-config-set.sh
index ff50960cca..13e95561f4 100755
--- a/t/t1308-config-set.sh
+++ b/t/t1308-config-set.sh
@@ -187,7 +187,9 @@ test_expect_success POSIXPERM,SANITY 'proper error on
non-accessible files' '
chmod -r .git/config &&
test_when_finished "chmod +r .git/config" &&
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_expect_code 2 test-config configset_get_value foo.bar .git/config
2>output &&
+ grep "^warning:" output &&
+ grep "^Error" output >actual &&
test_cmp expect actual
'
--
2.11.0.157.gd943d85
