Add support for forcing a fetch whether or not the treeish could be resolved

Author: marshallpierce

build.gradle

@@ -6,18 +6,17 @@ repositories {
   jcenter()
 }
 
-ext.deps = [jsch: '0.0.9']
-
 defaultTasks 'build'
 
 dependencies {
   compile gradleApi()
   compile localGroovy()
 
-  compile 'org.eclipse.jgit:org.eclipse.jgit:3.7.0.201502260915-r'
+  compile 'org.eclipse.jgit:org.eclipse.jgit:4.4.1.201607150455-r'
 
-  compile "com.jcraft:jsch.agentproxy.jsch:${deps.jsch}"
-  compile "com.jcraft:jsch.agentproxy.connector-factory:${deps.jsch}"
+  compile "com.jcraft:jsch:0.1.53"
+  compile 'com.jcraft:jsch.agentproxy.connector-factory:0.0.9'
+  compile 'com.jcraft:jsch.agentproxy.jsch:0.0.9'
 
   testCompile 'junit:junit:4.12'
 }
@@ -91,8 +90,4 @@ uploadArchives {
       }
     }
   }
-}
-
-task wrapper(type: Wrapper) {
-  gradleVersion = '2.11'
-}
+}

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Tue Feb 16 07:32:36 PST 2016
+#Sat Aug 27 07:21:08 PDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -6,12 +6,30 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,26 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -157,4 +161,9 @@ function splitJvmOpts() {
 eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
 JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
 
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+  cd "$(dirname "$0")"
+fi
+
 exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

gradlew

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -49,7 +49,6 @@ goto fail
 @rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

gradlew.bat

@@ -54,6 +54,12 @@ class GitCloneTask extends DefaultTask {
    */
   boolean strictHostKeyChecking = true
 
+  /**
+   * Force a fetch even if the treeish could be resolved without a fetch. This is useful to do the equivalent of a
+   * 'git pull': fetching will cause a branch ref like 'origin/master' to point to the latest state in the remote.
+   */
+  boolean forceFetch = false
+
   @TaskAction
   def setUpRepo() {
 
@@ -98,35 +104,43 @@ class GitCloneTask extends DefaultTask {
         .readEnvironment()
 
     Repository repository = repositoryBuilder.build()
-    Git git = new Git(repository)
-
-    ObjectId ref = repository.resolve(treeish)
-
-    if (ref == null) {
-      // we may just need to fetch
-      git.fetch()
-          .setTransportConfigCallback(configCallback)
-          .call()
-
-      ref = repository.resolve(treeish)
-
-      if (ref == null) {
-        throw new RuntimeException("Couldn't resolve <$treeish>")
+    try {
+      Git git = new Git(repository)
+      try {
+
+        ObjectId ref = repository.resolve(treeish)
+
+        if (ref == null || forceFetch) {
+          // we may just need to fetch
+          git.fetch()
+              .setTransportConfigCallback(configCallback)
+              .call()
+
+          ref = repository.resolve(treeish)
+
+          if (ref == null) {
+            throw new RuntimeException("Couldn't resolve <$treeish>")
+          }
+        }
+
+        RevCommit revCommit = new RevWalk(repository).parseCommit(ref)
+
+        git.checkout()
+            .setAllPaths(true)
+            .setStartPoint(revCommit)
+            .call()
+
+        if (reset) {
+          git.reset()
+              .setMode(ResetCommand.ResetType.HARD)
+              .setRef(treeish)
+              .call()
+        }
+      } finally {
+        git.close()
       }
-    }
-
-    RevCommit revCommit = new RevWalk(repository).parseCommit(ref)
-
-    git.checkout()
-        .setAllPaths(true)
-        .setStartPoint(revCommit)
-        .call()
-
-    if (reset) {
-      git.reset()
-          .setMode(ResetCommand.ResetType.HARD)
-          .setRef(treeish)
-          .call()
+    } finally {
+      repository.close()
     }
   }
 }

src/main/groovy/com/palominolabs/gradle/task/git/clone/GitCloneTask.groovy

@@ -1,6 +1,7 @@
 package com.palominolabs.gradle.task.git.clone
 
 import org.eclipse.jgit.api.TransportConfigCallback
+import org.eclipse.jgit.transport.SshTransport
 import org.eclipse.jgit.transport.Transport
 import org.eclipse.jgit.transport.TransportGitSsh
 
@@ -21,8 +22,8 @@ final class SshAgentTransportConfigCallback implements TransportConfigCallback {
 
   @Override
   public void configure(Transport transport) {
-    if (transport instanceof TransportGitSsh) {
-      ((TransportGitSsh) transport).
+    if (transport instanceof SshTransport) {
+      ((SshTransport) transport).
           setSshSessionFactory(new SshAgentSshSessionFactory(knownHostsPath, trySshAgent, identityPrivKeyPath,
               strictHostKeyChecking))
     }