Merge branch 'stable-3.6'

* stable-3.6:
  Prepare 3.6.1-SNAPSHOT builds
  JGit v3.6.0.201412230720-r
  [pgm] Add option --bare to clone command
  [pgm] Implement clone using CloneCommand
  Fix junit tests under windows when the platform is explicitly changed
  Fix unit tests for windows by explicitly closing test repos
  [pgm] Add option --tags for ls-remote
  [pgm] Add option --heads for ls-remote
  [pgm] Use LsRemoteCommand to implement ls-remote and add a test

Change-Id: I8f31e76cb7e9416919f37e02c7e51ab1d221df40
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

3 files changed, 42 insertions, 39 deletions

diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
index 7b9bd64bc1..dc2f80099a 100644
--- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
@@ -2,49 +2,49 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin_name
 Bundle-SymbolicName: org.eclipse.jgit.test
-Bundle-Version: 3.6.0.qualifier
+Bundle-Version: 3.6.1.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %provider_name
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: com.googlecode.javaewah;version="[0.7.9,0.8.0)",
- org.eclipse.jgit.api;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.api.errors;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.awtui;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.blame;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.console;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.diff;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.dircache;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.errors;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.events;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.fnmatch;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.gitrepo;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.ignore;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.ignore.internal;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.internal;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.internal.storage.file;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.internal.storage.pack;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.junit;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.lib;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.merge;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.nls;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.notes;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.patch;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.pgm;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.pgm.internal;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.revplot;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.revwalk;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.revwalk.filter;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.storage.file;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.storage.pack;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.submodule;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.transport;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.transport.http;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.treewalk;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.treewalk.filter;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.util;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.util.io;version="[3.6.0,3.7.0)",
+ org.eclipse.jgit.api;version="[3.6.1,3.7.0)",
+ org.eclipse.jgit.api.errors;version="[3.6.1,3.7.0)",
+ org.eclipse.jgit.awtui;version="[3.6.1,3.7.0)",
+ org.eclipse.jgit.blame;version="[3.6.1,3.7.0)",
+ org.eclipse.jgit.console;version="[3.6.1,3.7.0)",
+ org.eclipse.jgit.diff;version="[3.6.1,3.7.0)",
+ org.eclipse.jgit.dircache;version="[3.6.1,3.7.0)",
+ org.eclipse.jgit.errors;version="[3.6.1,3.7.0)",
+ org.eclipse.jgit.events;version="[3.6.1,3.7.0)",
+ org.eclipse.jgit.fnmatch;version="[3.6.1,3.7.0)",
+ org.eclipse.jgit.gitrepo;version="[3.6.1,3.7.0)",
+ org.eclipse.jgit.ignore;version="[3.6.1,3.7.0)",
+ org.eclipse.jgit.ignore.internal;version="[3.6.1,3.7.0)",
+ org.eclipse.jgit.internal;version="[3.6.1,3.7.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[3.6.1,3.7.0)",
+ org.eclipse.jgit.internal.storage.file;version="[3.6.1,3.7.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[3.6.1,3.7.0)",
+ org.eclipse.jgit.junit;version="[3.6.1,3.7.0)",
+ org.eclipse.jgit.lib;version="[3.6.1,3.7.0)",
+ org.eclipse.jgit.merge;version="[3.6.1,3.7.0)",
+ org.eclipse.jgit.nls;version="[3.6.1,3.7.0)",
+ org.eclipse.jgit.notes;version="[3.6.1,3.7.0)",
+ org.eclipse.jgit.patch;version="[3.6.1,3.7.0)",
+ org.eclipse.jgit.pgm;version="[3.6.1,3.7.0)",
+ org.eclipse.jgit.pgm.internal;version="[3.6.1,3.7.0)",
+ org.eclipse.jgit.revplot;version="[3.6.1,3.7.0)",
+ org.eclipse.jgit.revwalk;version="[3.6.1,3.7.0)",
+ org.eclipse.jgit.revwalk.filter;version="[3.6.1,3.7.0)",
+ org.eclipse.jgit.storage.file;version="[3.6.1,3.7.0)",
+ org.eclipse.jgit.storage.pack;version="[3.6.1,3.7.0)",
+ org.eclipse.jgit.submodule;version="[3.6.1,3.7.0)",
+ org.eclipse.jgit.transport;version="[3.6.1,3.7.0)",
+ org.eclipse.jgit.transport.http;version="[3.6.1,3.7.0)",
+ org.eclipse.jgit.treewalk;version="[3.6.1,3.7.0)",
+ org.eclipse.jgit.treewalk.filter;version="[3.6.1,3.7.0)",
+ org.eclipse.jgit.util;version="[3.6.1,3.7.0)",
+ org.eclipse.jgit.util.io;version="[3.6.1,3.7.0)",
  org.hamcrest;version="[1.1.0,2.0.0)",
  org.junit;version="[4.4.0,5.0.0)",
  org.junit.experimental.theories;version="[4.4.0,5.0.0)",
diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml
index 07883eb530..5330318d73 100644
--- a/org.eclipse.jgit.test/pom.xml
+++ b/org.eclipse.jgit.test/pom.xml
@@ -52,7 +52,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>3.6.0-SNAPSHOT</version>
+    <version>3.6.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.test</artifactId>
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java
index ece1b324b0..ea07beed70 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java
@@ -146,6 +146,7 @@ public class CloneCommandTest extends RepositoryTestCase {
 		command.setGitDir(new File(directory, ".git"));
 		command.setURI(fileUri());
 		Git git2 = command.call();
+		addRepoToClose(git2.getRepository());
 		assertEquals(directory, git2.getRepository().getWorkTree());
 		assertEquals(new File(directory, ".git"), git2.getRepository()
 				.getDirectory());
@@ -161,6 +162,7 @@ public class CloneCommandTest extends RepositoryTestCase {
 		command.setGitDir(gDir);
 		command.setURI(fileUri());
 		Git git2 = command.call();
+		addRepoToClose(git2.getRepository());
 		assertEquals(directory, git2.getRepository().getWorkTree());
 		assertEquals(gDir, git2.getRepository()
 				.getDirectory());
@@ -177,6 +179,7 @@ public class CloneCommandTest extends RepositoryTestCase {
 		command.setGitDir(gDir);
 		command.setURI(fileUri());
 		Git git2 = command.call();
+		addRepoToClose(git2.getRepository());
 		try {
 			assertNull(null, git2.getRepository().getWorkTree());
 			fail("Expected NoWorkTreeException");