diff options
| author | Stefan Lay | 2010-08-27 15:15:17 +0000 |
|---|---|---|
| committer | Code Review | 2010-08-27 15:15:17 +0000 |
| commit | 2131c14b02cf51a5c007c9cffe80db542ddbc201 (patch) | |
| tree | fc6efa5870bb5f7ff01ef7fcc497564d215a1080 /org.eclipse.egit.core | |
| parent | a97cc8d2ffcb48bdff037daa60a43a14f6e8ba8d (diff) | |
| parent | 8a77b0e19796c460a79308020cf2f3ec16cba184 (diff) | |
| download | egit-2131c14b02cf51a5c007c9cffe80db542ddbc201.tar.gz egit-2131c14b02cf51a5c007c9cffe80db542ddbc201.tar.xz egit-2131c14b02cf51a5c007c9cffe80db542ddbc201.zip | |
Merge "Don't display merge commit as conflicting"
Diffstat (limited to 'org.eclipse.egit.core')
| -rw-r--r-- | org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/dto/GitSynchronizeData.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/dto/GitSynchronizeData.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/dto/GitSynchronizeData.java index 6f0ce80179..f22585ca2b 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/dto/GitSynchronizeData.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/dto/GitSynchronizeData.java @@ -17,7 +17,6 @@ import java.util.Set; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.egit.core.project.RepositoryMapping; -import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.ObjectWalk; import org.eclipse.jgit.revwalk.RevCommit; @@ -55,12 +54,9 @@ public class GitSynchronizeData { String dstRev, boolean includeLocal) throws IOException { repo = repository; - Ref srcRef = repo.getRef(srcRev); - Ref dstRef = repo.getRef(dstRev); ObjectWalk ow = new ObjectWalk(repo); - - this.srcRev = ow.parseCommit(srcRef.getObjectId()); - this.dstRev = ow.parseCommit(dstRef.getObjectId()); + this.srcRev = ow.parseCommit(repo.resolve(srcRev)); + this.dstRev = ow.parseCommit(repo.resolve(dstRev)); this.includeLocal = includeLocal; repoParentPath = repo.getDirectory().getParentFile().getAbsolutePath(); |