diff options
| author | Vicent Marti <tanoku@gmail.com> | 2013-04-15 23:18:24 +0200 |
|---|---|---|
| committer | Vicent Marti <tanoku@gmail.com> | 2013-04-15 23:18:24 +0200 |
| commit | d064c74794f51e759cd84648f84f2609d3283ecc (patch) | |
| tree | 8ec58c4678fbc85f0038bf3eff89d67b3879ead7 /src/revwalk.c | |
| parent | 77849ebf1e39126bcb9f1245423749d45d226022 (diff) | |
| parent | 201566539f38874b4e93c6a36593bd0d10e6352c (diff) | |
| download | libgit2-d064c74794f51e759cd84648f84f2609d3283ecc.tar.gz | |
Merge remote-tracking branch 'ben/unified-revparse' into development
Diffstat (limited to 'src/revwalk.c')
| -rw-r--r-- | src/revwalk.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/revwalk.c b/src/revwalk.c index c1071843b..05e99c0b6 100644 --- a/src/revwalk.c +++ b/src/revwalk.c @@ -232,12 +232,12 @@ int git_revwalk_push_ref(git_revwalk *walk, const char *refname) int git_revwalk_push_range(git_revwalk *walk, const char *range) { git_object *left, *right; - int threedots; + git_revparse_flag_t revparseflags; int error = 0; - if ((error = git_revparse_rangelike(&left, &right, &threedots, walk->repo, range))) + if ((error = git_revparse(&left, &right, &revparseflags, walk->repo, range))) return error; - if (threedots) { + if (revparseflags & GIT_REVPARSE_MERGE_BASE) { /* TODO: support "<commit>...<commit>" */ giterr_set(GITERR_INVALID, "Symmetric differences not implemented in revwalk"); return GIT_EINVALIDSPEC; |