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

Merge pull request #777 from benstraub/revparse-fixup

Browse Source 
Revparse fixup
This commit is contained in:
Vicent Martí 2012-06-20 03:51:25 -07:00
commit eaf18ac312
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/revparse.c
View File

@ -323,10 +323,10 @@ static git_object* dereference_object(git_object *obj)
break;
case GIT_OBJ_TAG:
{
git_object *newobj = NULL;
if (0 == git_tag_target(&newobj, (git_tag*)obj)) {
return newobj;
}
git_object *newobj = NULL;
if (0 == git_tag_target(&newobj, (git_tag*)obj)) {
return newobj;
}
}
break;
@ -506,8 +506,8 @@ static int handle_linear_syntax(git_object **out, git_object *obj, const char *m
/* "~" is the same as "~1" */
if (*movement == '\0') {
n = 1;
} else {
git__strtol32(&n, movement, NULL, 0);
} else if (git__strtol32(&n, movement, NULL, 0) < 0) {
return GIT_ERROR;
}
commit1 = (git_commit*)obj;
@ -581,7 +581,7 @@ static int handle_colon_syntax(git_object **out,
git_tree_free(tree);
if (error < 0)
return error;
return error;
return git_object_lookup(out, repo, &oid, GIT_OBJ_ANY);
}
@ -623,7 +623,7 @@ static int revparse_global_grep(git_object **out, git_repository *repo, const ch
}
if (!resultobj) {
giterr_set(GITERR_REFERENCE, "Couldn't find a match for %s", pattern);
git_object_free(walkobj);
git_object_free(walkobj);
} else {
*out = resultobj;
}

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

@ -104,6 +104,9 @@ void test_refs_revparse__to_type(void)
void test_refs_revparse__linear_history(void)
{
cl_git_fail(git_revparse_single(&g_obj, g_repo, "foo~bar"));
cl_git_fail(git_revparse_single(&g_obj, g_repo, "master~bar"));
test_object("master~0", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750");
test_object("master~1", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644");
test_object("master~2", "9fd738e8f7967c078dceed8190330fc8648ee56a");