proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-07 18:11:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

config: Fix compilation in MSVC

Browse Source
This commit is contained in:
Vicent Marti 2011-06-18 01:12:58 +02:00
parent 4007044553
commit dbe70bd5c3
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/config.c
View File

@ -303,7 +303,8 @@ int git_config_get_string(git_config *cfg, const char *name, const char **out)
{ {
file_internal *internal; file_internal *internal;
git_config_file *file; git_config_file *file;
int i, error; int error = GIT_ENOTFOUND;
unsigned int i;
if (cfg->files.length == 0) if (cfg->files.length == 0)
return git__throw(GIT_EINVALIDARGS, "Cannot get variable value; no files open in the `git_config` instance"); return git__throw(GIT_EINVALIDARGS, "Cannot get variable value; no files open in the `git_config` instance");
@ -311,11 +312,10 @@ int git_config_get_string(git_config *cfg, const char *name, const char **out)
for (i = 0; i < cfg->files.length; ++i) { for (i = 0; i < cfg->files.length; ++i) {
internal = git_vector_get(&cfg->files, i); internal = git_vector_get(&cfg->files, i);
file = internal->file; file = internal->file;
error = file->get(file, name, out); if ((error = file->get(file, name, out)) == GIT_SUCCESS)
if (error == GIT_SUCCESS) return GIT_SUCCESS;
break;
} }
return error; return git__throw(error, "Config value '%s' not found", name);
} }

9
tests/t15-config.c
View File

@ -212,18 +212,11 @@ END_TEST
BEGIN_TEST(config10, "a repo's config overrides the global config") BEGIN_TEST(config10, "a repo's config overrides the global config")
git_repository *repo; git_repository *repo;
char home_orig[GIT_PATH_MAX];
char *home;
git_config *cfg; git_config *cfg;
int version; int version;
home = getenv("HOME");
strcpy(home_orig, home);
setenv("HOME", CONFIG_BASE, 1);
must_pass(git_repository_open(&repo, REPOSITORY_FOLDER)); must_pass(git_repository_open(&repo, REPOSITORY_FOLDER));
must_pass(git_repository_config(&cfg, repo, NULL, NULL)); must_pass(git_repository_config(&cfg, repo, CONFIG_BASE "/.gitconfig", NULL));
setenv("HOME", home_orig, 1);
must_pass(git_config_get_int(cfg, "core.repositoryformatversion", &version)); must_pass(git_config_get_int(cfg, "core.repositoryformatversion", &version));
must_be_true(version == 0); must_be_true(version == 0);
git_config_free(cfg); git_config_free(cfg);