Commit 43a07b860b9c172081e3c9dee18aeead9091f2cf
2013-10-09T16:16:43
Simplify loading blob
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
diff --git a/examples/blame.c b/examples/blame.c
index 5efb199..a7d0a12 100644
--- a/examples/blame.c
+++ b/examples/blame.c
@@ -32,13 +32,11 @@ int main(int argc, char *argv[])
int i, line;
char *path = NULL, *a;
const char *rawdata, *commitspec=NULL;
+ char spec[1024] = {0};
git_repository *repo = NULL;
git_revspec revspec = {0};
git_blame_options opts = GIT_BLAME_OPTIONS_INIT;
git_blame *blame = NULL;
- git_commit *commit;
- git_tree *tree;
- git_tree_entry *entry;
git_blob *blob;
git_threads_init();
@@ -86,16 +84,19 @@ int main(int argc, char *argv[])
check(git_blame_file(&blame, repo, path, &opts), "Blame error");
/* Get the raw data for output */
- if (git_oid_iszero(&opts.newest_commit)) {
+ if (git_oid_iszero(&opts.newest_commit))
+ strcpy(spec, "HEAD");
+ else
+ git_oid_tostr(spec, sizeof(spec), &opts.newest_commit);
+ strcat(spec, ":");
+ strcat(spec, path);
+
+ {
git_object *obj;
- check(git_revparse_single(&obj, repo, "HEAD"), "Can't find HEAD");
- git_oid_cpy(&opts.newest_commit, git_object_id(obj));
+ check(git_revparse_single(&obj, repo, spec), "Object lookup error");
+ check(git_blob_lookup(&blob, repo, git_object_id(obj)), "Blob lookup error");
git_object_free(obj);
}
- check(git_commit_lookup(&commit, repo, &opts.newest_commit), "Commit lookup error");
- check(git_commit_tree(&tree, commit), "Commit tree lookup error");
- check(git_tree_entry_bypath(&entry, tree, path), "Tree entry lookup error");
- check(git_blob_lookup(&blob, repo, git_tree_entry_id(entry)), "Blob lookup error");
rawdata = git_blob_rawcontent(blob);
/* Produce the output */
@@ -126,9 +127,6 @@ int main(int argc, char *argv[])
/* Cleanup */
git_blob_free(blob);
- git_tree_entry_free(entry);
- git_tree_free(tree);
- git_commit_free(commit);
git_blame_free(blame);
git_repository_free(repo);
git_threads_shutdown();