Exclude submodules from zip downloads (issue 151)

diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd
index a26b2c8afc117aededc3bac0a5895fd4e84e3895..920ae386df9aebe61e32993804d164ccd271534b 100644 (file)
--- 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
 \r
 #### fixes\r
 \r
+- Exclude submodules from zip downloads (issue 151)\r
 - Fixed bug where repository ownership was not updated on rename user\r
 - Fixed bug in create/rename repository if you explicitly specified the alias for the root group (e.g. main/myrepo) (issue 143)\r
 - Wrapped Markdown parser with improved exception handler (issue 142)\r

diff --git a/src/com/gitblit/utils/JGitUtils.java b/src/com/gitblit/utils/JGitUtils.java
index 231b935ceec8335973bca3c201d9c9bd84f90222..bc44f00f30c7337a387b0f0dba266278c05098ed 100644 (file)
--- a/src/com/gitblit/utils/JGitUtils.java
+++ b/src/com/gitblit/utils/JGitUtils.java
@@ -1756,6 +1756,9 @@ public class JGitUtils {
                        }\r
                        tw.setRecursive(true);\r
                        while (tw.next()) {\r
+                               if (tw.getFileMode(0) == FileMode.GITLINK) {\r
+                                       continue;\r
+                               }\r
                                ZipEntry entry = new ZipEntry(tw.getPathString());\r
                                entry.setSize(tw.getObjectReader().getObjectSize(tw.getObjectId(0),\r
                                                Constants.OBJ_BLOB));\r