Exclude submodules from zip downloads (issue 151)

kevinanderson1 · Oct 20, 2012 · 13417cf · 13417cf
1 parent b0e1642
commit 13417cf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd
@@ -11,6 +11,7 @@ If you are updating from an earlier release AND you have indexed branches with t
 
 #### fixes
 
+- Exclude submodules from zip downloads (issue 151)
 - Fixed bug where repository ownership was not updated on rename user
 - Fixed bug in create/rename repository if you explicitly specified the alias for the root group (e.g. main/myrepo) (issue 143)
 - Wrapped Markdown parser with improved exception handler (issue 142)

diff --git a/src/com/gitblit/utils/JGitUtils.java b/src/com/gitblit/utils/JGitUtils.java
@@ -1756,6 +1756,9 @@ public static boolean zip(Repository repository, String basePath, String objectI
 			}
 			tw.setRecursive(true);
 			while (tw.next()) {
+				if (tw.getFileMode(0) == FileMode.GITLINK) {
+					continue;
+				}
 				ZipEntry entry = new ZipEntry(tw.getPathString());
 				entry.setSize(tw.getObjectReader().getObjectSize(tw.getObjectId(0),
 						Constants.OBJ_BLOB));