Fix rtyley#92 properly- don't write malformed refspecs, but tolerate them

Use JGit library patched to tolerate the malformed refspecs generated by
JGit v1.0-v2.3.1 for bare-repo clones. From JGit v2.1 onwards (commit
3da13473), these malformed refspecs were no longer tolerated and would
stop fetches from updating refs. Normalising the refspecs fixes this
issue and allows fetches to update refs successfully.

https://bugs.eclipse.org/bugs/show_bug.cgi?id=402031

Author: rtyley

agit-integration-tests/src/main/java/com/madgag/agit/GitAsyncTaskTest.java

@@ -58,9 +58,9 @@
 import java.io.IOException;
 import java.util.concurrent.CountDownLatch;
 
-import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.storage.file.FileRepository;
+import org.eclipse.jgit.transport.RefSpec;
 import org.eclipse.jgit.transport.RemoteConfig;
 import org.eclipse.jgit.transport.URIish;
 
@@ -122,6 +122,8 @@ public void testFetchUpdatesOnCloneFromLocalTestServer() throws Exception {
 
         Repository repository = executeAndWaitFor(cloneOp);
 
+        printFetchRefSpecs(repository);
+
         String initialCommitId = "3974996807a9f596cf25ac3a714995c24bb97e2c", commit1 = "ce1e0703402e989bedf03d5df535401340f54b42";
         assertThat(repository, hasGitObject(initialCommitId));
         assertThat(repository.resolve("master").name(), equalTo(initialCommitId));
@@ -135,6 +137,13 @@ public void testFetchUpdatesOnCloneFromLocalTestServer() throws Exception {
         assertThat(repository.resolve("master").name(), equalTo(commit1));
     }
 
+    private void printFetchRefSpecs(Repository repository) {
+        RemoteConfig remoteConfig = remoteConfigFor(repository, DEFAULT_REMOTE_NAME);
+        for (RefSpec refSpec : remoteConfig.getFetchRefSpecs()) {
+            Log.i(TAG, "refSpec = " + refSpec);
+        }
+    }
+
     @MediumTest
     public void testFetchUpdatesFromLocalTestServer() throws Exception {
         Repository repository = helper().unpackRepo("small-test-repo.early.bare.git.zap");

agit/src/main/java/com/madgag/agit/GitFetchService.java

@@ -30,10 +30,12 @@
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Map;
 
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.TransportConfigCallback;
 import org.eclipse.jgit.api.errors.GitAPIException;
+import org.eclipse.jgit.lib.Ref;
 import org.eclipse.jgit.transport.CredentialsProvider;
 import org.eclipse.jgit.transport.FetchResult;
 import org.eclipse.jgit.transport.RefSpec;
@@ -58,6 +60,9 @@ public class GitFetchService {
     public FetchResult fetch(String remote, Collection<RefSpec> toFetch) {
         Log.d(TAG, "About to run fetch : " + remote);
 
+        for (Map.Entry<String,Ref> entry : git.getRepository().getAllRefs().entrySet()) {
+            Log.d(TAG, entry.getKey()+" = "+entry.getValue());
+        }
         FetchResult fetchResult = null;
         try {
             fetchResult = git.fetch()
@@ -70,7 +75,10 @@ public FetchResult fetch(String remote, Collection<RefSpec> toFetch) {
         } catch (GitAPIException e) {
             throw exceptionWithFriendlyMessageFor(e);
         }
-        Log.d(TAG, "Fetch complete with : " + fetchResult);
+        Log.d(TAG, "Fetch complete with : " + fetchResult+" messages="+fetchResult.getMessages());
+        for (Ref ref : fetchResult.getAdvertisedRefs()) {
+            Log.d(TAG, "AdvertisedRef : " + ref.getName()+" objectId="+ref.getObjectId());
+        }
         for (TrackingRefUpdate update : fetchResult.getTrackingRefUpdates()) {
             Log.d(TAG, "TrackingRefUpdate : " + update.getLocalName() + " old=" + update.getOldObjectId() + " new=" + update.getNewObjectId());
         }

pom.xml

@@ -62,7 +62,7 @@
             <dependency>
                 <groupId>com.madgag</groupId>
                 <artifactId>org.eclipse.jgit</artifactId>
-                <version>2.0.0.0.1-UNOFFICIAL-ROBERTO-RELEASE</version>
+                <version>2.3.1.1.0-UNOFFICIAL-ROBERTO-RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.google.android</groupId>