From 51c76e7366c2e8851f1639fbdbf2b8deb219c7fc Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 24 May 2013 17:38:12 -0400
Subject: [PATCH] Added support for displaying refs/pull/n/head|merge
---
src/main/java/com/gitblit/models/PushLogEntry.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/gitblit/models/PushLogEntry.java b/src/main/java/com/gitblit/models/PushLogEntry.java
index f625c2a..8323073 100644
--- a/src/main/java/com/gitblit/models/PushLogEntry.java
+++ b/src/main/java/com/gitblit/models/PushLogEntry.java
@@ -28,6 +28,7 @@
import java.util.Set;
import org.eclipse.jgit.lib.Constants;
+import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.transport.ReceiveCommand;
@@ -183,6 +184,14 @@
Collections.sort(list);
return list;
}
+
+ public PersonIdent getCommitterIdent() {
+ return new PersonIdent(user.getDisplayName(), user.emailAddress == null ? user.username : user.emailAddress);
+ }
+
+ public PersonIdent getAuthorIdent() {
+ return getCommitterIdent();
+ }
@Override
public int compareTo(PushLogEntry o) {
--
Gitblit v1.9.1