spigot-mirror/buildtools
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/buildtools.git synced 2025-08-19 12:53:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Try and handle "Invalid ref name: origin/master" (how does this happen?)

Browse source
This commit is contained in:
md_5 2018-12-18 17:04:10 +11:00
parent 22a271cf0f
commit 5c6ac9f467
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -64,6 +64,7 @@ import org.apache.commons.io.output.TeeOutputStream;
import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.ResetCommand; import org.eclipse.jgit.api.ResetCommand;
import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.api.errors.JGitInternalException;
import org.eclipse.jgit.lib.StoredConfig; import org.eclipse.jgit.lib.StoredConfig;
import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevCommit;
@ -639,7 +640,14 @@ public class Builder
{ {
System.out.println( "Pulling updates for " + repo.getRepository().getDirectory() ); System.out.println( "Pulling updates for " + repo.getRepository().getDirectory() );
repo.reset().setRef( "origin/master" ).setMode( ResetCommand.ResetType.HARD ).call(); try
{
repo.reset().setRef( "origin/master" ).setMode( ResetCommand.ResetType.HARD ).call();
} catch ( JGitInternalException ex )
{
System.err.println( "*** Warning, could not find origin/master ref, but continuing anyway." );
System.err.println( "*** If further errors occur please delete " + repo.getRepository().getDirectory().getParent() + " and retry." );
}
repo.fetch().call(); repo.fetch().call();
System.out.println( "Successfully fetched updates!" ); System.out.println( "Successfully fetched updates!" );