diff options
author | Carlos Martín Nieto <cmn@dwim.me> | 2015-03-07 00:06:02 +0100 |
---|---|---|
committer | Carlos Martín Nieto <cmn@dwim.me> | 2015-03-16 16:57:30 +0100 |
commit | 62dd4d71db1408ae03ca7d4d4d2c48f7874a41d9 (patch) | |
tree | 93bcef330efb90f7186183d9f92e22626f041831 | |
parent | 62d38a1ddb8081f8b46e7ff6e21ebeb0014162d6 (diff) | |
download | libgit2-62dd4d71db1408ae03ca7d4d4d2c48f7874a41d9.tar.gz |
annotated_commit: provide a constructor from a revspec
This extra constructor will be useful for the annotated versions of
ref-modifying functions, as it allows us to create a commit with the
extended sha syntax which was used to retrieve it.
-rw-r--r-- | include/git2/annotated_commit.h | 17 | ||||
-rw-r--r-- | src/annotated_commit.c | 28 |
2 files changed, 45 insertions, 0 deletions
diff --git a/include/git2/annotated_commit.h b/include/git2/annotated_commit.h index e842d2032..7fb896a5f 100644 --- a/include/git2/annotated_commit.h +++ b/include/git2/annotated_commit.h @@ -78,6 +78,23 @@ GIT_EXTERN(int) git_annotated_commit_lookup( const git_oid *id); /** + * Creates a `git_annotated_comit` from a revision string. + * + * See `man gitrevisions`, or + * http://git-scm.com/docs/git-rev-parse.html#_specifying_revisions for + * information on the syntax accepted. + * + * @param out pointer to store the git_annotated_commit result in + * @param repo repository that contains the given commit + * @param revspec the extended sha syntax string to use to lookup the commit + * @return 0 on success or error code + */ +GIT_EXTERN(int) git_annotated_commit_from_revspec( + git_annotated_commit **out, + git_repository *repo, + const char *revspec); + +/** * Gets the commit ID that the given `git_annotated_commit` refers to. * * @param commit the given annotated commit diff --git a/src/annotated_commit.c b/src/annotated_commit.c index 0a917802a..3f2d2ed17 100644 --- a/src/annotated_commit.c +++ b/src/annotated_commit.c @@ -12,6 +12,7 @@ #include "git2/refs.h" #include "git2/repository.h" #include "git2/annotated_commit.h" +#include "git2/revparse.h" static int annotated_commit_init( git_annotated_commit **out, @@ -96,6 +97,33 @@ int git_annotated_commit_from_fetchhead( return annotated_commit_init(out, repo, id, branch_name, remote_url); } +int git_annotated_commit_from_revspec( + git_annotated_commit **out, + git_repository *repo, + const char *revspec) +{ + git_object *obj, *commit; + int error; + + assert(out && repo && revspec); + + if ((error = git_revparse_single(&obj, repo, revspec)) < 0) + return error; + + if ((error = git_object_peel(&commit, obj, GIT_OBJ_COMMIT))) { + git_object_free(obj); + return error; + } + + error = annotated_commit_init(out, repo, git_object_id(commit), revspec, NULL); + + git_object_free(obj); + git_object_free(commit); + + return error; +} + + const git_oid *git_annotated_commit_id( const git_annotated_commit *annotated_commit) { |