From 0356af9ced8cf91d6c0d0203f4323f651041695d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Fri, 28 Sep 2018 16:19:41 +0200
Subject: [PATCH] Fix head ref computation

---
 .../src/main/java/sonia/scm/repository/GitUtil.java  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitUtil.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitUtil.java
index 0f6daff0e0..aac0557d7f 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitUtil.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitUtil.java
@@ -525,11 +525,13 @@ public final class GitUtil
           foundRef = of(e.getValue().getTarget());
           break;
         }
-      } else if (key.startsWith(REF_HEAD_PREFIX) && REF_MASTER.equals(key.substring(REF_HEAD_PREFIX.length()))) {
-        foundRef = of(e.getValue());
-        break;
-      } else {
-        lastHeadRef = e.getValue();
+      } else if (key.startsWith(REF_HEAD_PREFIX)) {
+        if (REF_MASTER.equals(key.substring(REF_HEAD_PREFIX.length()))) {
+          foundRef = of(e.getValue());
+          break;
+        } else {
+          lastHeadRef = e.getValue();
+        }
       }
     }