proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-02 19:32:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Abstract the refspec query and parse

Browse Source 
Move them to their own functions to avoid duplication and to make it
easier to ignore missing configuration.

Not finding 'fetch' is considered fatal, though this might not be
correct behaviour (push-only remotes?)

Signed-off-by: Carlos Martín Nieto <carlos@cmartin.tk>
This commit is contained in:
Carlos Martín Nieto 2011-06-20 18:58:57 +02:00
parent 9c82357be7
commit 2dc31040a2
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/git2.h
View File

@ -53,6 +53,7 @@
#include "git2/index.h"
#include "git2/config.h"
#include "git2/remote.h"
#include "git2/remote.h"
#include "git2/refspec.h"

20
src/remote.c
View File

@ -69,7 +69,7 @@ static int parse_remote_refspec(git_config *cfg, git_refspec *refspec, const cha
if (error < GIT_SUCCESS)
return error;
return git_refspec_parse(refspec, val);
return refspec_parse(refspec, val);
}
int git_remote_get(git_remote **out, git_config *cfg, const char *name)
@ -122,13 +122,11 @@ int git_remote_get(git_remote **out, git_config *cfg, const char *name)
goto cleanup;
}
error = git_config_get_string(cfg, buf, &val);
if (error < GIT_SUCCESS)
goto cleanup;
error = refspec_parse(&remote->fetch, val);
if (error < GIT_SUCCESS)
error = parse_remote_refspec(cfg, &remote->fetch, buf);
if (error < GIT_SUCCESS) {
error = git__rethrow(error, "Failed to get fetch refspec");
goto cleanup;
}
ret = snprintf(buf, buf_len, "%s.%s.%s", "remote", name, "push");
if (ret < 0) {
@ -136,11 +134,11 @@ int git_remote_get(git_remote **out, git_config *cfg, const char *name)
goto cleanup;
}
error = git_config_get_string(cfg, buf, &val);
if (error < GIT_SUCCESS)
goto cleanup;
error = parse_remote_refspec(cfg, &remote->push, buf);
/* Not finding push is fine */
if (error == GIT_ENOTFOUND)
error = GIT_SUCCESS;
error = refspec_parse(&remote->push, val);
if (error < GIT_SUCCESS)
goto cleanup;