Commit 77db6ff5c7b5a233b6dae24347b660f2752c1359
2013-09-21T22:01:53
Simplify blob loading logic
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64
diff --git a/src/blame.c b/src/blame.c
index ccfbb1e..ed816da 100644
--- a/src/blame.c
+++ b/src/blame.c
@@ -256,6 +256,22 @@ static git_blame_hunk* hunk_from_entry(git_blame__entry *e)
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)
{
int error;
@@ -309,27 +325,6 @@ cleanup:
* 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(
git_blame **out,
git_repository *repo,
@@ -346,7 +341,7 @@ int git_blame_file(
blame = git_blame__alloc(repo, normOptions, path);
GITERR_CHECK_ALLOC(blame);
- if ((error = load_blob(blame, repo, &normOptions.newest_commit, path)) < 0)
+ if ((error = load_blob(blame)) < 0)
goto on_error;
if ((error = blame_internal(blame)) < 0)