From 7bd53bf38548ee039ae40bb669469625ce97a54e Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Sat, 2 Mar 2013 13:52:38 -0800 Subject: [PATCH] Simplify diff example using revparse When the examples/diff.c was written, there was not yet a revparse API. Now we can use it to make command line parsing way better with less code. Yay! --- examples/diff.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/examples/diff.c b/examples/diff.c index 17bf8427e..a153b493b 100644 --- a/examples/diff.c +++ b/examples/diff.c @@ -15,28 +15,9 @@ static int resolve_to_tree( git_repository *repo, const char *identifier, git_tree **tree) { int err = 0; - size_t len = strlen(identifier); - git_oid oid; git_object *obj = NULL; - /* try to resolve as OID */ - if (git_oid_fromstrn(&oid, identifier, len) == 0) - git_object_lookup_prefix(&obj, repo, &oid, len, GIT_OBJ_ANY); - - /* try to resolve as reference */ - if (obj == NULL) { - git_reference *ref, *resolved; - if (git_reference_lookup(&ref, repo, identifier) == 0) { - git_reference_resolve(&resolved, ref); - git_reference_free(ref); - if (resolved) { - git_object_lookup(&obj, repo, git_reference_target(resolved), GIT_OBJ_ANY); - git_reference_free(resolved); - } - } - } - - if (obj == NULL) + if (git_revparse_single(&obj, repo, identifier) < 0) return GIT_ENOTFOUND; switch (git_object_type(obj)) {