Can't even imagine how I missed this bug

CadixDev · May 30, 2015 · 09870f3 · 09870f3
1 parent a217248
commit 09870f3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -12,7 +12,7 @@ plugins {
 }
 
 group = 'net.minecrell'
-version = '0.5'
+version = '0.5.1'
 description = 'A Gradle plugin to manage patches for Git repositories'
 
 sourceCompatibility = 1.6

diff --git a/src/main/groovy/net/minecrell/gitpatcher/task/patch/ApplyPatchesTask.groovy b/src/main/groovy/net/minecrell/gitpatcher/task/patch/ApplyPatchesTask.groovy
@@ -64,7 +64,7 @@ class ApplyPatchesTask extends PatchTask {
 
         git.repo = repo
         git.fetch('origin') >> null
-        git.checkout('-B', 'master', 'origin/master') >> null
+        git.checkout('-B', 'master', 'origin/upstream') >> null
         git.reset('--hard') >> out
 
         if (patchDir.isDirectory()) {