motiejus
/
jgit
1
Fork 0
Code Releases Activity

Really handle annotated tags in MergeCommand 

Repository.peel() must be called to ensure a tag is really peeled.

Change-Id: I83e25f09fad3ad55a3ffe41ab4758f249b7ac9f9
This commit is contained in:
Robin Rosenberg 2013-02-08 06:47:50 +01:00
parent 60d538fe51
commit 3a4ebc0c24
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java
View File

@ -234,6 +234,7 @@ public MergeResult call() throws GitAPIException, NoHeadException,
refLogMessage.append(ref.getName());
// handle annotated tags
ref = repo.peel(ref);
ObjectId objectId = ref.getPeeledObjectId();
if (objectId == null)
objectId = ref.getObjectId();