From 9129381d7a55c0dfae625b2b07fe1e04409df6a3 Mon Sep 17 00:00:00 2001
From: Philip L. McMahon <philip.l.mcmahon@gmail.com>
Date: Fri, 27 Jan 2012 00:20:21 -0500
Subject: [PATCH] Allow administrative modification of the default branch/tag referenced by HEAD.
---
src/com/gitblit/GitBlit.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java
index bf3660d..b6bf7bf 100644
--- a/src/com/gitblit/GitBlit.java
+++ b/src/com/gitblit/GitBlit.java
@@ -69,6 +69,7 @@
import com.gitblit.models.FederationProposal;
import com.gitblit.models.FederationSet;
import com.gitblit.models.Metric;
+import com.gitblit.models.RefModel;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.ServerSettings;
import com.gitblit.models.ServerStatus;
@@ -786,6 +787,10 @@
model.mailingLists = new ArrayList<String>(Arrays.asList(config.getStringList(
"gitblit", null, "mailingList")));
}
+ model.defaultHead = JGitUtils.getDefaultHead(r);
+ model.availableHeads = new ArrayList<RefModel>();
+ model.availableHeads.addAll(JGitUtils.getLocalBranches(r, true, -1));
+ model.availableHeads.addAll(JGitUtils.getTags(r, true, -1));
r.close();
return model;
}
@@ -981,6 +986,9 @@
// update settings
if (r != null) {
updateConfiguration(r, repository);
+ if (repository.defaultHead != null) {
+ JGitUtils.setDefaultHead(r, repository.defaultHead.reference);
+ }
r.close();
}
}
--
Gitblit v1.9.1