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

Factor out some code that needed to clear errors

Browse Source 
A number of places were looking up option config values and then
not clearing the error codes if the values were not found.  This
moves the repeated pattern into a shared routine and adds the
extra call to giterr_clear() when needed.
This commit is contained in:
Russell Belfer 2013-05-01 15:23:40 -07:00
parent 41e93563e7
commit bf6bebe22e
1 changed files with 42 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/remote.c
View File

@ -63,8 +63,10 @@ static int download_tags_value(git_remote *remote, git_config *cfg)
else if (!error && !strcmp(val, "--tags")) else if (!error && !strcmp(val, "--tags"))
remote->download_tags = GIT_REMOTE_DOWNLOAD_TAGS_ALL; remote->download_tags = GIT_REMOTE_DOWNLOAD_TAGS_ALL;
if (error == GIT_ENOTFOUND) if (error == GIT_ENOTFOUND) {
giterr_clear();
error = 0; error = 0;
}
return error; return error;
} }
@ -210,6 +212,31 @@ static int refspec_cb(const git_config_entry *entry, void *payload)
return add_refspec(data->remote, entry->value, data->fetch); return add_refspec(data->remote, entry->value, data->fetch);
} }
static int get_optional_config(
git_config *config, git_buf *buf, git_config_foreach_cb cb, void *payload)
{
int error = 0;
const char *key = git_buf_cstr(buf);
if (git_buf_oom(buf))
return -1;
if (cb != NULL)
error = git_config_get_multivar(config, key, NULL, cb, payload);
else
error = git_config_get_string(payload, config, key);
if (error == GIT_ENOTFOUND) {
giterr_clear();
error = 0;
}
if (error < 0)
error = -1;
return error;
}
int git_remote_load(git_remote **out, git_repository *repo, const char *name) int git_remote_load(git_remote **out, git_repository *repo, const char *name)
{ {
git_remote *remote; git_remote *remote;
@ -250,7 +277,7 @@ int git_remote_load(git_remote **out, git_repository *repo, const char *name)
if ((error = git_config_get_string(&val, config, git_buf_cstr(&buf))) < 0) if ((error = git_config_get_string(&val, config, git_buf_cstr(&buf))) < 0)
goto cleanup; goto cleanup;
if (strlen(val) == 0) { if (strlen(val) == 0) {
giterr_set(GITERR_INVALID, "Malformed remote '%s' - missing URL", name); giterr_set(GITERR_INVALID, "Malformed remote '%s' - missing URL", name);
error = -1; error = -1;
@ -261,60 +288,32 @@ int git_remote_load(git_remote **out, git_repository *repo, const char *name)
remote->url = git__strdup(val); remote->url = git__strdup(val);
GITERR_CHECK_ALLOC(remote->url); GITERR_CHECK_ALLOC(remote->url);
val = NULL;
git_buf_clear(&buf); git_buf_clear(&buf);
if (git_buf_printf(&buf, "remote.%s.pushurl", name) < 0) { git_buf_printf(&buf, "remote.%s.pushurl", name);
error = -1;
goto cleanup;
}
error = git_config_get_string(&val, config, git_buf_cstr(&buf)); if ((error = get_optional_config(config, &buf, NULL, &val)) < 0)
if (error == GIT_ENOTFOUND) {
val = NULL;
error = 0;
}
if (error < 0) {
error = -1;
goto cleanup; goto cleanup;
}
if (val) { if (val) {
remote->pushurl = git__strdup(val); remote->pushurl = git__strdup(val);
GITERR_CHECK_ALLOC(remote->pushurl); GITERR_CHECK_ALLOC(remote->pushurl);
} }
git_buf_clear(&buf);
if (git_buf_printf(&buf, "remote.%s.fetch", name) < 0) {
error = -1;
goto cleanup;
}
data.remote = remote; data.remote = remote;
data.fetch = true; data.fetch = true;
error = git_config_get_multivar(config, git_buf_cstr(&buf), NULL, refspec_cb, &data);
if (error == GIT_ENOTFOUND)
error = 0;
if (error < 0) {
error = -1;
goto cleanup;
}
git_buf_clear(&buf); git_buf_clear(&buf);
if (git_buf_printf(&buf, "remote.%s.push", name) < 0) { git_buf_printf(&buf, "remote.%s.fetch", name);
error = -1;
if ((error = get_optional_config(config, &buf, refspec_cb, &data)) < 0)
goto cleanup; goto cleanup;
}
data.fetch = false; data.fetch = false;
error = git_config_get_multivar(config, git_buf_cstr(&buf), NULL, refspec_cb, &data); git_buf_clear(&buf);
if (error == GIT_ENOTFOUND) git_buf_printf(&buf, "remote.%s.push", name);
error = 0;
if (error < 0) { if ((error = get_optional_config(config, &buf, refspec_cb, &data)) < 0)
error = -1;
goto cleanup; goto cleanup;
}
if (download_tags_value(remote, config) < 0) if (download_tags_value(remote, config) < 0)
goto cleanup; goto cleanup;
@ -336,7 +335,7 @@ static int update_config_refspec(const git_remote *remote, git_config *config, i
int push; int push;
const char *dir; const char *dir;
size_t i; size_t i;
int error = -1; int error = 0;
push = direction == GIT_DIRECTION_PUSH; push = direction == GIT_DIRECTION_PUSH;
dir = push ? "push" : "fetch"; dir = push ? "push" : "fetch";
@ -345,9 +344,8 @@ static int update_config_refspec(const git_remote *remote, git_config *config, i
return -1; return -1;
/* Clear out the existing config */ /* Clear out the existing config */
do { while (!error)
error = git_config_delete_entry(config, git_buf_cstr(&name)); error = git_config_delete_entry(config, git_buf_cstr(&name));
} while (!error);
if (error != GIT_ENOTFOUND) if (error != GIT_ENOTFOUND)
return error; return error;
@ -358,7 +356,8 @@ static int update_config_refspec(const git_remote *remote, git_config *config, i
if (spec->push != push) if (spec->push != push)
continue; continue;
if ((error = git_config_set_multivar(config, git_buf_cstr(&name), "", spec->string)) < 0) { if ((error = git_config_set_multivar(
config, git_buf_cstr(&name), "", spec->string)) < 0) {
goto cleanup; goto cleanup;
} }
} }