From: Luca Milanesio <luca@milanesio.org>
Date: Sun, 2 Dec 2012 08:50:55 +0000 (+0000)
Subject: FIX: Allow correct search for RefModel using branch name.
X-Git-Tag: v1.2.0~44
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8744a1e9de208117bc6187d9e917b9ed8da83f94;p=gitblit.git

FIX: Allow correct search for RefModel using branch name.

DisplayName used previously contained ONLY the last part
of ref-spec: this would have not worked when looking for
objects with full ref-spec.
---

diff --git a/src/com/gitblit/utils/JGitUtils.java b/src/com/gitblit/utils/JGitUtils.java
index 9cfb37fd..beaa27da 100644
--- a/src/com/gitblit/utils/JGitUtils.java
+++ b/src/com/gitblit/utils/JGitUtils.java
@@ -1528,7 +1528,7 @@ public class JGitUtils {
 		try {
 			// search for the branch in local heads
 			for (RefModel ref : JGitUtils.getLocalBranches(repository, false, -1)) {
-				if (ref.displayName.endsWith(name)) {
+				if (ref.reference.getName().endsWith(name)) {
 					branch = ref;
 					break;
 				}
@@ -1537,7 +1537,7 @@ public class JGitUtils {
 			// search for the branch in remote heads
 			if (branch == null) {
 				for (RefModel ref : JGitUtils.getRemoteBranches(repository, false, -1)) {
-					if (ref.displayName.endsWith(name)) {
+					if (ref.reference.getName().endsWith(name)) {
 						branch = ref;
 						break;
 					}