Merge "Make --git-dir optional for 'jgit init'"

org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Init.java

@@ -69,6 +69,7 @@ class Init extends TextBuiltin {
 	protected void run() throws Exception {
 		InitCommand command = Git.init();
 		command.setBare(bare);
+		if (gitdir != null)
 			command.setDirectory(new File(gitdir));
 		Repository repository = command.call().getRepository();
 		out.println(MessageFormat.format(

org.eclipse.jgit/src/org/eclipse/jgit/api/InitCommand.java

@@ -83,7 +83,7 @@ public class InitCommand implements Callable<Git> {
 			} else if (builder.getGitDir() == null) {
 				File d = new File(".");
 				if (!bare)
-					d = new File(d, Constants.DOT_GIT);
+					d = new File(d, Constants.DOT_GIT).getCanonicalFile();
 				builder.setGitDir(d);
 			}
 			Repository repository = builder.build();