From 615af14477b5ba896662c160c41c50a86e9203cc Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 02 Feb 2012 17:39:10 -0500
Subject: [PATCH] Drop -javadoc jar dependencies, they are unnecessary
---
src/com/gitblit/GitBlit.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java
index bf3660d..7216126 100644
--- a/src/com/gitblit/GitBlit.java
+++ b/src/com/gitblit/GitBlit.java
@@ -786,6 +786,8 @@
model.mailingLists = new ArrayList<String>(Arrays.asList(config.getStringList(
"gitblit", null, "mailingList")));
}
+ model.defaultHead = JGitUtils.getSymbolicHeadTarget(r);
+ model.availableHeads = JGitUtils.getAvailableHeadTargets(r);
r.close();
return model;
}
@@ -981,6 +983,11 @@
// update settings
if (r != null) {
updateConfiguration(r, repository);
+ // only update symbolic head if it changes
+ if (!StringUtils.isEmpty(repository.defaultHead) &&
+ !repository.defaultHead.equals(JGitUtils.getSymbolicHeadTarget(r))) {
+ JGitUtils.setSymbolicHeadTarget(r, repository.defaultHead);
+ }
r.close();
}
}
--
Gitblit v1.9.1