spigot-mirror/buildtools
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/buildtools.git synced 2025-04-13 09:31:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix a few issues

Browse source
This commit is contained in:
Thinkofdeath 2015-03-16 16:34:13 +00:00
parent 0165b6e1c7
commit 65e9b03550
1 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/main/java/org/spigotmc/builder/Builder.java
View file

@ -62,6 +62,7 @@ import org.eclipse.jgit.lib.CoreConfig;
import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.lib.StoredConfig; import org.eclipse.jgit.lib.StoredConfig;
import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.transport.FetchResult;
import org.eclipse.jgit.transport.RefSpec; import org.eclipse.jgit.transport.RefSpec;
import org.eclipse.jgit.transport.RemoteConfig; import org.eclipse.jgit.transport.RemoteConfig;
import org.eclipse.jgit.transport.TagOpt; import org.eclipse.jgit.transport.TagOpt;
@ -409,12 +410,12 @@ public class Builder
System.out.println( "Applying patches to " + target ); System.out.println( "Applying patches to " + target );
Git gitOrig = Git.open( orig ); Git gitOrig = Git.open( orig );
gitOrig.fetch() FetchResult fr = gitOrig.fetch()
.setRemote( "file://" + base.getAbsolutePath() ) .setRemote( base.toURI().toString() )
.setRefSpecs( new RefSpec( "refs/heads/*:refs/remotes/origin/*" ) ) .setRefSpecs( new RefSpec( "refs/heads/*:refs/remotes/origin/*" ) )
.call(); .call();
gitOrig.reset() gitOrig.reset()
.setRef( "origin/" + branch ) .setRef( fr.getAdvertisedRef( "refs/heads/" + branch ).getObjectId().getName() )
.setMode( ResetCommand.ResetType.HARD ) .setMode( ResetCommand.ResetType.HARD )
.call(); .call();
gitOrig.branchCreate() gitOrig.branchCreate()
@ -436,12 +437,8 @@ public class Builder
git.checkout() git.checkout()
.setName( "master" ) .setName( "master" )
.call(); .call();
git.fetch()
.setRemote( "upstream" )
.setRefSpecs( new RefSpec( "refs/heads/*:refs/remotes/upstream/*" ) )
.call();
git.reset() git.reset()
.setRef( "refs/remotes/upstream/upstream" ) .setRef( "origin/upstream" )
.setMode( ResetCommand.ResetType.HARD ) .setMode( ResetCommand.ResetType.HARD )
.call(); .call();
git.clean().setCleanDirectories( true ).call(); git.clean().setCleanDirectories( true ).call();
@ -521,11 +518,20 @@ public class Builder
System.out.println( "Successfully fetched updates!" ); System.out.println( "Successfully fetched updates!" );
repo.reset().setRef( ref ).setMode( ResetCommand.ResetType.HARD ).call(); if ( ref.equals( "master" ) ) ref = "origin/master";
if ( ref.equals( "master" ) )
{
repo.reset().setRef( "origin/master" ).setMode( ResetCommand.ResetType.HARD ).call(); repo.branchCreate()
} .setForce( true )
.setStartPoint( ref )
.setName( "master" )
.call();
repo.checkout()
.setForce( true )
.setStartPoint( ref )
.setName( "master" )
.call();
System.out.println( "Checked out: " + ref ); System.out.println( "Checked out: " + ref );
} }