Get default branch in case use doesn't specify

line · Mar 23, 2024 · f05407b · f05407b
1 parent 20772a8
commit f05407b
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/...git/src/main/java/com/linecorp/centraldogma/server/internal/mirror/AbstractGitMirror.java b/...git/src/main/java/com/linecorp/centraldogma/server/internal/mirror/AbstractGitMirror.java
@@ -257,8 +257,8 @@ void mirrorRemoteToLocal(
             changes.put(mirrorStatePath, Change.ofJsonUpsert(
                     mirrorStatePath, "{ \"sourceRevision\": \"" + headCommitId.name() + "\" }"));
             // Construct the log message and log.
-            summary = "Mirror " + abbrId + ", " + remoteRepoUri() +
-                    (remoteBranch() != null ? '#' + remoteBranch() : "") +
+            final String branchName = getRemoteBranchName(headBranchRef);
+            summary = "Mirror " + abbrId + ", " + remoteRepoUri() + '#' + branchName +
                       " to the repository '" + localRepo().name() + '\'';
             final RevCommit headCommit = revWalk.parseCommit(headCommitId);
             detail = generateCommitDetail(headCommit);
@@ -724,6 +724,16 @@ static void updateRef(org.eclipse.jgit.lib.Repository jGitRepository, RevWalk re
         }
     }
 
+    private String getRemoteBranchName(Ref headBranchRef) {
+        if (remoteBranch() != null && !remoteBranch().isEmpty()) {
+            return remoteBranch();
+        }
+        if (headBranchRef.getName().startsWith(Constants.R_HEADS)) {
+            return headBranchRef.getName().substring(Constants.R_HEADS.length());
+        }
+        return "";
+    }
+
     private static final class InsertText extends PathEdit {
         private final ObjectInserter inserter;
         private final String text;