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

Set a sane autocrlf value on fresh clones.

Browse source
This commit is contained in:
md_5 2015-09-02 07:32:27 +10:00
parent 7750a2f992
commit 190add0752
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -58,6 +58,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.lib.StoredConfig;
import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevCommit;
public class Builder public class Builder
@ -66,6 +67,7 @@ public class Builder
public static final String LOG_FILE = "BuildTools.log.txt"; public static final String LOG_FILE = "BuildTools.log.txt";
public static final boolean IS_WINDOWS = System.getProperty( "os.name" ).startsWith( "Windows" ); public static final boolean IS_WINDOWS = System.getProperty( "os.name" ).startsWith( "Windows" );
public static final File CWD = new File( "." ); public static final File CWD = new File( "." );
private static final boolean autocrlf = !"\n".equals( System.getProperty( "line.separator" ) );
private static boolean dontUpdate; private static boolean dontUpdate;
private static boolean skipCompile; private static boolean skipCompile;
private static boolean generateSource; private static boolean generateSource;
@ -610,7 +612,7 @@ public class Builder
} }
} }
public static void clone(String url, File target) throws GitAPIException public static void clone(String url, File target) throws GitAPIException, IOException
{ {
System.out.println( "Starting clone of " + url + " to " + target ); System.out.println( "Starting clone of " + url + " to " + target );
@ -618,8 +620,11 @@ public class Builder
try try
{ {
System.out.println( "Cloned git repository " + url + " to " + target.getAbsolutePath() + ". Current HEAD: " + commitHash( result ) ); StoredConfig config = result.getRepository().getConfig();
config.setBoolean( "core", null, "autocrlf", autocrlf );
config.save();
System.out.println( "Cloned git repository " + url + " to " + target.getAbsolutePath() + ". Current HEAD: " + commitHash( result ) );
} finally } finally
{ {
result.close(); result.close();