proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-08 03:15:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remote: use the refspec functions to parse, instead of rolling our own

Browse Source 
The local function works for simple cases, but we shouldn't reinvent
the wheel just for us.
This commit is contained in:
Carlos Martín Nieto 2012-09-29 22:50:33 +02:00
parent f70e466f68
commit eb0bd77a88
1 changed files with 9 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/remote.c
View File

@ -18,33 +18,7 @@
#include <regex.h> #include <regex.h>
static int refspec_parse(git_refspec *refspec, const char *str) static int parse_remote_refspec(git_config *cfg, git_refspec *refspec, const char *var, bool is_fetch)
{
char *delim;
memset(refspec, 0x0, sizeof(git_refspec));
if (*str == '+') {
refspec->force = 1;
str++;
}
delim = strchr(str, ':');
if (delim == NULL) {
giterr_set(GITERR_NET, "Invalid refspec, missing ':'");
return -1;
}
refspec->src = git__strndup(str, delim - str);
GITERR_CHECK_ALLOC(refspec->src);
refspec->dst = git__strdup(delim + 1);
GITERR_CHECK_ALLOC(refspec->dst);
return 0;
}
static int parse_remote_refspec(git_config *cfg, git_refspec *refspec, const char *var)
{ {
int error; int error;
const char *val; const char *val;
@ -52,7 +26,7 @@ static int parse_remote_refspec(git_config *cfg, git_refspec *refspec, const cha
if ((error = git_config_get_string(&val, cfg, var)) < 0) if ((error = git_config_get_string(&val, cfg, var)) < 0)
return error; return error;
return refspec_parse(refspec, val); return git_refspec__parse(refspec, val, is_fetch);
} }
static int download_tags_value(git_remote *remote, git_config *cfg) static int download_tags_value(git_remote *remote, git_config *cfg)
@ -106,7 +80,7 @@ int git_remote_new(git_remote **out, git_repository *repo, const char *name, con
} }
if (fetch != NULL) { if (fetch != NULL) {
if (refspec_parse(&remote->fetch, fetch) < 0) if (git_refspec__parse(&remote->fetch, fetch, true) < 0)
goto on_error; goto on_error;
} }
@ -182,7 +156,7 @@ int git_remote_load(git_remote **out, git_repository *repo, const char *name)
goto cleanup; goto cleanup;
} }
error = parse_remote_refspec(config, &remote->fetch, git_buf_cstr(&buf)); error = parse_remote_refspec(config, &remote->fetch, git_buf_cstr(&buf), true);
if (error == GIT_ENOTFOUND) if (error == GIT_ENOTFOUND)
error = 0; error = 0;
@ -197,7 +171,7 @@ int git_remote_load(git_remote **out, git_repository *repo, const char *name)
goto cleanup; goto cleanup;
} }
error = parse_remote_refspec(config, &remote->push, git_buf_cstr(&buf)); error = parse_remote_refspec(config, &remote->push, git_buf_cstr(&buf), false);
if (error == GIT_ENOTFOUND) if (error == GIT_ENOTFOUND)
error = 0; error = 0;
@ -345,11 +319,10 @@ int git_remote_set_fetchspec(git_remote *remote, const char *spec)
assert(remote && spec); assert(remote && spec);
if (refspec_parse(&refspec, spec) < 0) if (git_refspec__parse(&refspec, spec, true) < 0)
return -1; return -1;
git__free(remote->fetch.src); git_refspec__free(&remote->fetch);
git__free(remote->fetch.dst);
remote->fetch.src = refspec.src; remote->fetch.src = refspec.src;
remote->fetch.dst = refspec.dst; remote->fetch.dst = refspec.dst;
@ -368,11 +341,10 @@ int git_remote_set_pushspec(git_remote *remote, const char *spec)
assert(remote && spec); assert(remote && spec);
if (refspec_parse(&refspec, spec) < 0) if (git_refspec__parse(&refspec, spec, false) < 0)
return -1; return -1;
git__free(remote->push.src); git_refspec__free(&remote->push);
git__free(remote->push.dst);
remote->push.src = refspec.src; remote->push.src = refspec.src;
remote->push.dst = refspec.dst; remote->push.dst = refspec.dst;