From 2d486781df0828eae716937b23d2df0a9c1817f9 Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Mon, 12 Jun 2017 12:02:27 +0100 Subject: [PATCH] repository: don't fail to create config option in inmemory repo When in an in-memory repository - without a configuration file - do not fail to create a configuration object. --- src/repository.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/repository.c b/src/repository.c index 27553ad0a..7ecb00ed8 100644 --- a/src/repository.c +++ b/src/repository.c @@ -943,13 +943,10 @@ static int load_config( if ((error = git_config_new(&cfg)) < 0) return error; - error = git_repository_item_path(&config_path, repo, GIT_REPOSITORY_ITEM_CONFIG); - if (error < 0) - goto on_error; + if ((error = git_repository_item_path(&config_path, repo, GIT_REPOSITORY_ITEM_CONFIG)) == 0) + error = git_config_add_file_ondisk(cfg, config_path.ptr, GIT_CONFIG_LEVEL_LOCAL, 0); - if ((error = git_config_add_file_ondisk( - cfg, config_path.ptr, GIT_CONFIG_LEVEL_LOCAL, 0)) < 0 && - error != GIT_ENOTFOUND) + if (error && error != GIT_ENOTFOUND) goto on_error; git_buf_free(&config_path);