From 088746fa37d5eb6562f7dccf88368957696e9913 Mon Sep 17 00:00:00 2001 From: Robin Rosenberg Date: Thu, 12 Jan 2012 09:29:13 -0800 Subject: [PATCH] [historyView] Include un-annotated tags in the commit info viewer Change-Id: I01c543c732d20ede16ba3f57ae2d66d886b84907 Signed-off-by: Kevin Sawicki --- .../src/org/eclipse/egit/ui/internal/history/CommitInfoBuilder.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitInfoBuilder.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitInfoBuilder.java index 4e751b642..c21ad0bf0 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitInfoBuilder.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitInfoBuilder.java @@ -445,8 +445,10 @@ public class CommitInfoBuilder { StringBuilder sb = new StringBuilder(); Map tagsMap = db.getTags(); for (Entry tagEntry : tagsMap.entrySet()) { - ObjectId peeledId = tagEntry.getValue().getPeeledObjectId(); - if (peeledId != null && peeledId.equals(commit)) { + ObjectId target = tagEntry.getValue().getPeeledObjectId(); + if (target == null) + target = tagEntry.getValue().getObjectId(); + if (target != null && target.equals(commit)) { if (sb.length() > 0) sb.append(", "); //$NON-NLS-1$ sb.append(tagEntry.getKey()); -- 2.11.4.GIT