proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-21 20:14:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

revparse: Make revparse_ext() return git_reference from names as well

Browse Source
This commit is contained in:
nulltoken 2013-05-10 20:15:57 +02:00
parent e841c533d7
commit f672cd2a09
2 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/revparse.c
View File

@ -84,12 +84,16 @@ static int maybe_describe(git_object**out, git_repository *repo, const char *spe
return maybe_abbrev(out, repo, substr+2); return maybe_abbrev(out, repo, substr+2);
} }
static int revparse_lookup_object(git_object **out, git_repository *repo, const char *spec) static int revparse_lookup_object(
git_object **object_out,
git_reference **reference_out,
git_repository *repo,
const char *spec)
{ {
int error; int error;
git_reference *ref; git_reference *ref;
error = maybe_sha(out, repo, spec); error = maybe_sha(object_out, repo, spec);
if (!error) if (!error)
return 0; return 0;
@ -98,22 +102,27 @@ static int revparse_lookup_object(git_object **out, git_repository *repo, const
error = git_reference_dwim(&ref, repo, spec); error = git_reference_dwim(&ref, repo, spec);
if (!error) { if (!error) {
error = git_object_lookup(out, repo, git_reference_target(ref), GIT_OBJ_ANY);
git_reference_free(ref); error = git_object_lookup(
object_out, repo, git_reference_target(ref), GIT_OBJ_ANY);
if (!error)
*reference_out = ref;
return error; return error;
} }
if (error < 0 && error != GIT_ENOTFOUND) if (error < 0 && error != GIT_ENOTFOUND)
return error; return error;
error = maybe_abbrev(out, repo, spec); error = maybe_abbrev(object_out, repo, spec);
if (!error) if (!error)
return 0; return 0;
if (error < 0 && error != GIT_ENOTFOUND) if (error < 0 && error != GIT_ENOTFOUND)
return error; return error;
error = maybe_describe(out, repo, spec); error = maybe_describe(object_out, repo, spec);
if (!error) if (!error)
return 0; return 0;
@ -609,7 +618,7 @@ static int object_from_reference(git_object **object, git_reference *reference)
return error; return error;
} }
static int ensure_base_rev_loaded(git_object **object, git_reference *reference, const char *spec, size_t identifier_len, git_repository *repo, bool allow_empty_identifier) static int ensure_base_rev_loaded(git_object **object, git_reference **reference, const char *spec, size_t identifier_len, git_repository *repo, bool allow_empty_identifier)
{ {
int error; int error;
git_buf identifier = GIT_BUF_INIT; git_buf identifier = GIT_BUF_INIT;
@ -617,8 +626,8 @@ static int ensure_base_rev_loaded(git_object **object, git_reference *reference,
if (*object != NULL) if (*object != NULL)
return 0; return 0;
if (reference != NULL) if (*reference != NULL)
return object_from_reference(object, reference); return object_from_reference(object, *reference);
if (!allow_empty_identifier && identifier_len == 0) if (!allow_empty_identifier && identifier_len == 0)
return GIT_EINVALIDSPEC; return GIT_EINVALIDSPEC;
@ -626,7 +635,7 @@ static int ensure_base_rev_loaded(git_object **object, git_reference *reference,
if (git_buf_put(&identifier, spec, identifier_len) < 0) if (git_buf_put(&identifier, spec, identifier_len) < 0)
return -1; return -1;
error = revparse_lookup_object(object, repo, git_buf_cstr(&identifier)); error = revparse_lookup_object(object, reference, repo, git_buf_cstr(&identifier));
git_buf_free(&identifier); git_buf_free(&identifier);
return error; return error;
@ -684,7 +693,7 @@ int revparse__ext(
while (spec[pos]) { while (spec[pos]) {
switch (spec[pos]) { switch (spec[pos]) {
case '^': case '^':
if ((error = ensure_base_rev_loaded(&base_rev, reference, spec, identifier_len, repo, false)) < 0) if ((error = ensure_base_rev_loaded(&base_rev, &reference, spec, identifier_len, repo, false)) < 0)
goto cleanup; goto cleanup;
if (spec[pos+1] == '{') { if (spec[pos+1] == '{') {
@ -719,7 +728,7 @@ int revparse__ext(
if ((error = extract_how_many(&n, spec, &pos)) < 0) if ((error = extract_how_many(&n, spec, &pos)) < 0)
goto cleanup; goto cleanup;
if ((error = ensure_base_rev_loaded(&base_rev, reference, spec, identifier_len, repo, false)) < 0) if ((error = ensure_base_rev_loaded(&base_rev, &reference, spec, identifier_len, repo, false)) < 0)
goto cleanup; goto cleanup;
if ((error = handle_linear_syntax(&temp_object, base_rev, n)) < 0) if ((error = handle_linear_syntax(&temp_object, base_rev, n)) < 0)
@ -738,7 +747,7 @@ int revparse__ext(
goto cleanup; goto cleanup;
if (any_left_hand_identifier(base_rev, reference, identifier_len)) { if (any_left_hand_identifier(base_rev, reference, identifier_len)) {
if ((error = ensure_base_rev_loaded(&base_rev, reference, spec, identifier_len, repo, true)) < 0) if ((error = ensure_base_rev_loaded(&base_rev, &reference, spec, identifier_len, repo, true)) < 0)
goto cleanup; goto cleanup;
if ((error = handle_colon_syntax(&temp_object, base_rev, git_buf_cstr(&buf))) < 0) if ((error = handle_colon_syntax(&temp_object, base_rev, git_buf_cstr(&buf))) < 0)
@ -795,7 +804,7 @@ int revparse__ext(
} }
} }
if ((error = ensure_base_rev_loaded(&base_rev, reference, spec, identifier_len, repo, false)) < 0) if ((error = ensure_base_rev_loaded(&base_rev, &reference, spec, identifier_len, repo, false)) < 0)
goto cleanup; goto cleanup;
*object_out = base_rev; *object_out = base_rev;

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

@ -732,10 +732,10 @@ void test_refs_revparse__ext_retrieves_both_the_reference_and_its_target(void)
"refs/heads/br2"); "refs/heads/br2");
} }
void test_refs_revparse__ext_only_retrieve_the_object_target(void) void test_refs_revparse__ext_can_expand_short_reference_names(void)
{ {
test_object_and_ref( test_object_and_ref(
"master", "master",
"a65fedf39aefe402d3bb6e24df4d4f5fe4547750", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750",
NULL); "refs/heads/master");
} }