proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-07-09 14:36:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify blob loading logic

Browse Source
This commit is contained in:
Ben Straub 2013-09-21 22:01:53 -07:00
parent f0c9d8ba1c
commit 77db6ff5c7
1 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/blame.c
View File

@ -256,6 +256,22 @@ static git_blame_hunk* hunk_from_entry(git_blame__entry *e)
return h; return h;
} }
static int load_blob(git_blame *blame)
{
int error;
error = git_commit_lookup(&blame->final, blame->repository, &blame->options.newest_commit);
if (error < 0)
goto cleanup;
error = git_object_lookup_bypath((git_object**)&blame->final_blob,
(git_object*)blame->final, blame->path, GIT_OBJ_BLOB);
if (error < 0)
goto cleanup;
cleanup:
return error;
}
static int blame_internal(git_blame *blame) static int blame_internal(git_blame *blame)
{ {
int error; int error;
@ -309,27 +325,6 @@ cleanup:
* File blaming * File blaming
******************************************************************************/ ******************************************************************************/
static int load_blob(git_blame *blame, git_repository *repo, git_oid *commit_id, const char *path)
{
int retval = -1;
git_commit *commit = NULL;
git_tree *tree = NULL;
git_tree_entry *tree_entry = NULL;
git_object *obj = NULL;
if (((retval = git_commit_lookup(&commit, repo, commit_id)) < 0) ||
((retval = git_object_lookup_bypath(&obj, (git_object*)commit, path, GIT_OBJ_BLOB)) < 0) ||
((retval = git_object_type(obj)) != GIT_OBJ_BLOB))
goto cleanup;
blame->final_blob = (git_blob*)obj;
cleanup:
git_tree_entry_free(tree_entry);
git_tree_free(tree);
git_commit_free(commit);
return retval;
}
int git_blame_file( int git_blame_file(
git_blame **out, git_blame **out,
git_repository *repo, git_repository *repo,
@ -346,7 +341,7 @@ int git_blame_file(
blame = git_blame__alloc(repo, normOptions, path); blame = git_blame__alloc(repo, normOptions, path);
GITERR_CHECK_ALLOC(blame); GITERR_CHECK_ALLOC(blame);
if ((error = load_blob(blame, repo, &normOptions.newest_commit, path)) < 0) if ((error = load_blob(blame)) < 0)
goto on_error; goto on_error;
if ((error = blame_internal(blame)) < 0) if ((error = blame_internal(blame)) < 0)