diff options
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | 2013-02-08 06:47:50 +0100 |
|---|---|---|
| committer | Robin Rosenberg <robin.rosenberg@dewire.com> | 2013-02-08 07:27:37 +0100 |
| commit | 3a4ebc0c24b7732a57064299153794084fbfae59 (patch) | |
| tree | 4bf15ed62fff5e2f525e8b5cc19bbec876ef8cf2 | |
| parent | 60d538fe5142dc1ce547a77391e4142c4fb8a251 (diff) | |
| download | jgit-3a4ebc0c24b7732a57064299153794084fbfae59.tar.gz jgit-3a4ebc0c24b7732a57064299153794084fbfae59.zip | |
Really handle annotated tags in MergeCommand
Repository.peel() must be called to ensure a tag is really peeled.
Change-Id: I83e25f09fad3ad55a3ffe41ab4758f249b7ac9f9
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java index 6eba35e1d2..6c6aa7b5c5 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java @@ -234,6 +234,7 @@ public class MergeCommand extends GitCommand<MergeResult> { refLogMessage.append(ref.getName()); // handle annotated tags + ref = repo.peel(ref); ObjectId objectId = ref.getPeeledObjectId(); if (objectId == null) objectId = ref.getObjectId(); |