Fix problems with initializing submodule

stephan-gh · stephan-gh · commit af4bfa096bd5 · 2015-05-24T20:33:10.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -12,7 +12,7 @@ plugins {
 }
 
 group = 'net.minecrell'
-version = '0.4.2'
+version = '0.4.3'
 description = 'A Gradle plugin to manage patches for Git repositories'
 
 sourceCompatibility = 1.6
diff --git a/src/main/groovy/net/minecrell/gitpatcher/task/UpdateSubmodulesTask.groovy b/src/main/groovy/net/minecrell/gitpatcher/task/UpdateSubmodulesTask.groovy
@@ -38,7 +38,7 @@ class UpdateSubmodulesTask extends SubmoduleTask {
                 return
             }
 
-            if (status.type == SubmoduleStatusType.MISSING) {
+            if (status.type == SubmoduleStatusType.MISSING || status.type == SubmoduleStatusType.UNINITIALIZED) {
                 submoduleInit().addPath(submodule).call()
             } else if (status.type == SubmoduleStatusType.REV_CHECKED_OUT) {
                 logger.warn "Resetting submodule \"{}\" from {} back to {}", submodule, status.headId, status.indexId

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ plugins {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`group = 'net.minecrell'`
`15`		`-version = '0.4.2'`
	`15`	`+version = '0.4.3'`
`16`	`16`	`description = 'A Gradle plugin to manage patches for Git repositories'`
`17`	`17`
`18`	`18`	`sourceCompatibility = 1.6`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ class UpdateSubmodulesTask extends SubmoduleTask {`
`38`	`38`	`return`
`39`	`39`	`}`
`40`	`40`
`41`		`- if (status.type == SubmoduleStatusType.MISSING) {`
	`41`	`+ if (status.type == SubmoduleStatusType.MISSING \|\| status.type == SubmoduleStatusType.UNINITIALIZED) {`
`42`	`42`	`submoduleInit().addPath(submodule).call()`
`43`	`43`	`} else if (status.type == SubmoduleStatusType.REV_CHECKED_OUT) {`
`44`	`44`	`logger.warn "Resetting submodule \"{}\" from {} back to {}", submodule, status.headId, status.indexId`