Merge branch 'userrepoprefix' of https://github.com/fzs/gitblit into prefixes

build.moxie

diff --git a/build.moxie b/build.moxie
index 78bc4a4..424a7d7 100644
--- a/build.moxie
+++ b/build.moxie
@@ -10,7 +10,7 @@
 description: pure Java Git solution
 groupId: com.gitblit
 artifactId: gitblit
-version: 1.3.2
+version: 1.3.3-SNAPSHOT
 inceptionYear: 2011
 
 # Current stable release

build.xml

diff --git a/build.xml b/build.xml
index d34006e..077f7ad 100644
--- a/build.xml
+++ b/build.xml
@@ -8,7 +8,7 @@
 		documentation @ http://gitblit.github.io/moxie

 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 	-->

-	<property name="moxie.version" value="0.8.1" />

+	<property name="moxie.version" value="0.8.2" />

 	<property name="moxie.url" value="http://gitblit.github.io/moxie/maven" />

 	<property name="moxie.jar" value="moxie-toolkit-${moxie.version}.jar" />

 	<property name="moxie.dir" value="${user.home}/.moxie" />

@@ -1003,6 +1003,8 @@
 					<include name="sendmail-html.groovy" />

 					<include name="jenkins.groovy" />

 					<include name="protect-refs.groovy" />

+					<include name="blockpush.groovy" />

+					<include name="localclone.groovy" />

 					<include name="fogbugz.groovy" />

 					<include name="thebuggenie.groovy" />

 				</fileset>

release.template

diff --git a/release.template b/release.template
index 2dd45c8..f248efd 100644
--- a/release.template
+++ b/release.template
@@ -28,7 +28,7 @@
 echo "Building ${project.version} RELEASE artifacts"

 echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"

 echo ""

-ant clean buildAll

+ant clean buildAll buildMavenArtifacts

 

 # commit all generated artifacts and metadata

 echo ""

releases.moxie

diff --git a/releases.moxie b/releases.moxie
index 7145135..901bd33 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -1,4 +1,22 @@
 #
+# ${project.version} release
+#
+r20: {
+    title: ${project.name} ${project.version} released
+    id: ${project.version}
+    date: ${project.buildDate}
+    note: ~
+    html: ~
+    text: ~
+    security: ~
+    fixes: ~
+    changes: ~
+    additions: ~
+    dependencyChanges: ~
+    contributors: ~
+}
+
+#
 # 1.3.2 release
 #
 r19: {
@@ -975,6 +993,6 @@
 	- James Moger
 }
 
-snapshot: ~
+snapshot: &r20
 release: &r19
 releases: &r[1..19]

src/main/distrib/data/gitblit.properties

diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties
index 0837cde..7da65ff 100644
--- a/src/main/distrib/data/gitblit.properties
+++ b/src/main/distrib/data/gitblit.properties
@@ -956,7 +956,7 @@
 #

 # SPACE-DELIMITED

 # SINCE 0.9.0

-web.luceneIgnoreExtensions = 7z arc arj bin bmp dll doc docx exe gif gz jar jpg lib lzh odg odf odt pdf ppt png so swf xcf xls xlsx zip

+web.luceneIgnoreExtensions = 7z arc arj bin bmp dll doc docx exe gif gz jar jpg lib lzh odg odf odt pdf ppt pptx png so swf tar xcf xls xlsx zip

 

 # Registered extensions for google-code-prettify

 #

@@ -981,7 +981,7 @@
 #

 # SPACE-DELIMITED

 # SINCE 0.5.0

-web.binaryExtensions = jar pdf tar.gz zip

+web.binaryExtensions = 7z arc arj bin dll doc docx exe gz jar lib lzh odg odf odt pdf ppt pptx so tar xls xlsx zip

 

 # Aggressive heap management will run the garbage collector on every generated

 # page.  This slows down page generation a little but improves heap consumption. 

src/main/java/com/gitblit/GitBlit.java

diff --git a/src/main/java/com/gitblit/GitBlit.java b/src/main/java/com/gitblit/GitBlit.java
index 9b79e3c..2348f57 100644
--- a/src/main/java/com/gitblit/GitBlit.java
+++ b/src/main/java/com/gitblit/GitBlit.java
@@ -3607,7 +3607,7 @@
 			Date cutoff = CommitCache.instance().getCutoffDate();
 			for (String repositoryName : getRepositoryList()) {
 				RepositoryModel model = getRepositoryModel(repositoryName);
-				if (model.hasCommits && model.lastChange.after(cutoff)) {
+				if (model != null && model.hasCommits && model.lastChange.after(cutoff)) {
 					repoCount++;
 					Repository repository = getRepository(repositoryName);
 					for (RefModel ref : JGitUtils.getLocalBranches(repository, true, -1)) {

src/main/java/com/gitblit/utils/JGitUtils.java

diff --git a/src/main/java/com/gitblit/utils/JGitUtils.java b/src/main/java/com/gitblit/utils/JGitUtils.java
index 8676d74..3f01eea 100644
--- a/src/main/java/com/gitblit/utils/JGitUtils.java
+++ b/src/main/java/com/gitblit/utils/JGitUtils.java
@@ -566,6 +566,8 @@
 		try {

 			if (tree == null) {

 				ObjectId object = getDefaultBranch(repository);

+				if (object == null)

+					return null;

 				RevCommit commit = rw.parseCommit(object);

 				tree = commit.getTree();

 			}