From de6b94fa4c220b17e4ed74c74f113768c4f6067f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Tue, 2 Oct 2018 13:44:22 +0200
Subject: [PATCH] Remove code duplication

---
 .../repository/spi/AbstractGitCommand.java    | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitCommand.java
index 8e1a48ed1d..df21d61eef 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitCommand.java
@@ -102,12 +102,22 @@ public class AbstractGitCommand
     return commit;
   }
 
+  protected ObjectId getDefaultBranch(Repository gitRepository) throws IOException {
+    Ref ref = getBranchOrDefault(gitRepository, null);
+    if (ref == null) {
+      return null;
+    } else {
+      return ref.getObjectId();
+    }
+  }
+
   protected Ref getBranchOrDefault(Repository gitRepository, String requestedBranch) throws IOException {
     if ( Strings.isNullOrEmpty(requestedBranch) ) {
       String defaultBranchName = repository.getProperty(GitConstants.PROPERTY_DEFAULT_BRANCH);
       if (!Strings.isNullOrEmpty(defaultBranchName)) {
         return GitUtil.getBranchId(gitRepository, defaultBranchName);
       } else {
+        logger.trace("no default branch configured, use repository head as default");
         Optional<Ref> repositoryHeadRef = GitUtil.getRepositoryHeadRef(gitRepository);
         return repositoryHeadRef.orElse(null);
       }
@@ -116,19 +126,6 @@ public class AbstractGitCommand
     }
   }
 
-  protected ObjectId getDefaultBranch(Repository gitRepository) throws IOException {
-    ObjectId head;
-    String defaultBranchName = repository.getProperty(GitConstants.PROPERTY_DEFAULT_BRANCH);
-    if (!Strings.isNullOrEmpty(defaultBranchName)) {
-      Ref ref = GitUtil.getBranchId(gitRepository, defaultBranchName);
-      head = ref == null? null: ref.getObjectId();
-    } else {
-      logger.trace("no default branch configured, use repository head as default");
-      head = GitUtil.getRepositoryHead(gitRepository);
-    }
-    return head;
-  }
-
   //~--- fields ---------------------------------------------------------------
 
   /** Field description */