proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-06 09:41:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

revparse: unfound reference return ENOTFOUND

Browse Source
This commit is contained in:
nulltoken 2012-07-07 08:25:39 +02:00
parent ce9e8e11ca
commit 3e82d6c6f0
2 changed files with 52 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/revparse.c
View File

@ -47,8 +47,9 @@ static int spec_looks_like_describe_output(const char *spec)
regex_error = regcomp(&regex, ".+-[0-9]+-g[0-9a-fA-F]+", REG_EXTENDED);
if (regex_error != 0) {
giterr_set_regex(&regex, regex_error);
return 1; /* To be safe */
return regex_error;
}
retcode = regexec(&regex, spec, 0, NULL, 0);
regfree(&regex);
return retcode == 0;
@ -103,39 +104,66 @@ cleanup:
return error;
}
static int revparse_lookup_object(git_object **out, git_repository *repo, const char *spec)
extern int revparse_lookup_object(git_object **out, git_repository *repo, const char *spec);
static int maybe_describe(git_object**out, git_repository *repo, const char *spec)
{
size_t speclen = strlen(spec);
git_object *obj = NULL;
git_oid oid;
int error;
git_reference *ref;
const char *substr;
int match;
/* "git describe" output; snip everything before/including "-g" */
substr = strstr(spec, "-g");
if (substr &&
spec_looks_like_describe_output(spec) &&
!revparse_lookup_object(out, repo, substr+2)) {
return 0;
}
/* SHA or prefix */
if (!git_oid_fromstrn(&oid, spec, speclen)) {
if (!git_object_lookup_prefix(&obj, repo, &oid, speclen, GIT_OBJ_ANY)) {
*out = obj;
if (substr == NULL)
return GIT_ENOTFOUND;
if ((match = spec_looks_like_describe_output(spec)) < 0)
return match;
if (!match)
return GIT_ENOTFOUND;
return revparse_lookup_object(out, repo, substr+2);
}
static int maybe_sha_or_abbrev(git_object**out, git_repository *repo, const char *spec)
{
git_oid oid;
size_t speclen = strlen(spec);
if (git_oid_fromstrn(&oid, spec, speclen) < 0)
return GIT_ENOTFOUND;
return git_object_lookup_prefix(out, repo, &oid, speclen, GIT_OBJ_ANY);
}
int revparse_lookup_object(git_object **out, git_repository *repo, const char *spec)
{
int error;
git_reference *ref;
error = maybe_describe(out, repo, spec);
if (!error)
return 0;
}
}
if (error < 0 && error != GIT_ENOTFOUND)
return error;
error = maybe_sha_or_abbrev(out, repo, spec);
if (!error)
return 0;
if (error < 0 && error != GIT_ENOTFOUND)
return error;
error = disambiguate_refname(&ref, repo, spec);
if (!error) {
error = git_object_lookup(out, repo, git_reference_oid(ref), GIT_OBJ_ANY);
git_reference_free(ref);
return error;
return 0;
}
if (error < 0)
if (error < 0 && error != GIT_ENOTFOUND)
return error;
giterr_set(GITERR_REFERENCE, "Refspec '%s' not found.", spec);
@ -711,11 +739,9 @@ int git_revparse_single(git_object **out, git_repository *repo, const char *spec
if (current_state != next_state && next_state != REVPARSE_STATE_DONE) {
/* Leaving INIT state, find the object specified, in case that state needs it */
if (revparse_lookup_object(&next_obj, repo, git_buf_cstr(&specbuffer)) < 0) {
retcode = GIT_ERROR;
if ((retcode = revparse_lookup_object(&next_obj, repo, git_buf_cstr(&specbuffer))) < 0)
next_state = REVPARSE_STATE_DONE;
}
}
break;

2
tests-clar/refs/revparse.c
View File

@ -55,6 +55,8 @@ void test_refs_revparse__cleanup(void)
void test_refs_revparse__nonexistant_object(void)
{
test_object("this-does-not-exist", NULL);
test_object("this-does-not-exist^1", NULL);
test_object("this-does-not-exist~2", NULL);
}
void test_refs_revparse__invalid_reference_name(void)