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:
parent
60d538fe51
commit
3a4ebc0c24
|
@ -234,6 +234,7 @@ public MergeResult call() throws GitAPIException, NoHeadException,
|
||||||
refLogMessage.append(ref.getName());
|
refLogMessage.append(ref.getName());
|
||||||
|
|
||||||
// handle annotated tags
|
// handle annotated tags
|
||||||
|
ref = repo.peel(ref);
|
||||||
ObjectId objectId = ref.getPeeledObjectId();
|
ObjectId objectId = ref.getPeeledObjectId();
|
||||||
if (objectId == null)
|
if (objectId == null)
|
||||||
objectId = ref.getObjectId();
|
objectId = ref.getObjectId();
|
||||||
|
|
Loading…
Reference in New Issue