summaryrefslogtreecommitdiff
path: root/src/revparse.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/revparse.c')
-rw-r--r--src/revparse.c27
1 files changed, 26 insertions, 1 deletions
diff --git a/src/revparse.c b/src/revparse.c
index 2fd636135..fd62a2fd2 100644
--- a/src/revparse.c
+++ b/src/revparse.c
@@ -432,7 +432,7 @@ static int dereference_to_non_tag(git_object **out, git_object *obj)
if (git_object_type(obj) == GIT_OBJ_TAG)
return git_tag_peel(out, (git_tag *)obj);
- return git_object__dup(out, obj);
+ return git_object_dup(out, obj);
}
static int handle_caret_parent_syntax(git_object **out, git_object *obj, int n)
@@ -867,3 +867,28 @@ cleanup:
git_buf_free(&buf);
return error;
}
+
+int git_revparse_rangelike(git_object **left, git_object **right, int *threedots, git_repository *repo, const char *rangelike)
+{
+ int error = 0;
+ const char *p, *q;
+ char *revspec;
+
+ p = strstr(rangelike, "..");
+ if (!p) {
+ giterr_set(GITERR_INVALID, "Malformed range (or rangelike syntax): %s", rangelike);
+ return GIT_EINVALIDSPEC;
+ } else if (p[2] == '.') {
+ *threedots = 1;
+ q = p + 3;
+ } else {
+ *threedots = 0;
+ q = p + 2;
+ }
+
+ revspec = git__substrdup(rangelike, p - rangelike);
+ error = (git_revparse_single(left, repo, revspec)
+ || git_revparse_single(right, repo, q));
+ git__free(revspec);
+ return error;
+}