commit 701c5f67f89ee0cb048d9c442991ee549dd12ad3
author Shawn O. Pearce <sop@google.com> Fri Mar 11 17:21:01 2011 -0800
committer Shawn O. Pearce <sop@google.com> Fri Mar 11 17:21:01 2011 -0800
tree 616fcb9c84fc7c5897f6a7ceda4f71d8958ffdb7
parent 0ff5ff01121617e4bcdda25e67da46f71dcbc85c

Update JGit to 0.11.3.113-ga490afe

Change-Id: Ia89bdd8eebddf1bb060edfb4cf6a398a445197a6
Signed-off-by: Shawn O. Pearce <sop@google.com>

gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectServlet.java

diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectServlet.java
index eacd0cf..1db57ae 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectServlet.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectServlet.java
@@ -35,15 +35,15 @@
 import org.eclipse.jgit.errors.RepositoryNotFoundException;
 import org.eclipse.jgit.http.server.GitServlet;
 import org.eclipse.jgit.http.server.resolver.AsIsFileService;
-import org.eclipse.jgit.http.server.resolver.ReceivePackFactory;
-import org.eclipse.jgit.http.server.resolver.RepositoryResolver;
-import org.eclipse.jgit.http.server.resolver.ServiceNotAuthorizedException;
-import org.eclipse.jgit.http.server.resolver.ServiceNotEnabledException;
-import org.eclipse.jgit.http.server.resolver.UploadPackFactory;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.storage.pack.PackConfig;
 import org.eclipse.jgit.transport.ReceivePack;
 import org.eclipse.jgit.transport.UploadPack;
+import org.eclipse.jgit.transport.resolver.ReceivePackFactory;
+import org.eclipse.jgit.transport.resolver.RepositoryResolver;
+import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException;
+import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException;
+import org.eclipse.jgit.transport.resolver.UploadPackFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -124,7 +124,7 @@
     });
   }
 
-  static class Resolver implements RepositoryResolver {
+  static class Resolver implements RepositoryResolver<HttpServletRequest> {
     private final GitRepositoryManager manager;
     private final ProjectControl.Factory projectControlFactory;
 
@@ -175,7 +175,7 @@
     }
   }
 
-  static class Upload implements UploadPackFactory {
+  static class Upload implements UploadPackFactory<HttpServletRequest> {
     private final Provider<ReviewDb> db;
     private final PackConfig packConfig;
 
@@ -204,7 +204,7 @@
     }
   }
 
-  static class Receive implements ReceivePackFactory {
+  static class Receive implements ReceivePackFactory<HttpServletRequest> {
     private final ReceiveCommits.Factory factory;
 
     @Inject

gerrit-server/src/main/java/com/google/gerrit/server/git/PushOp.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/PushOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/PushOp.java
index 4fc2648..049e0e0 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/PushOp.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/PushOp.java
@@ -313,7 +313,7 @@
           if (dst == null || !src.getObjectId().equals(dst.getObjectId())) {
             // Doesn't exist yet, or isn't the same value, request to push.
             //
-            send(cmds, spec);
+            send(cmds, spec, src);
           }
         }
       }
@@ -335,8 +335,9 @@
         if (spec != null) {
           // If the ref still exists locally, send it, otherwise delete it.
           //
-          if (local.containsKey(src)) {
-            send(cmds, spec);
+          Ref srcRef = local.get(src);
+          if (srcRef != null) {
+            send(cmds, spec, srcRef);
           } else {
             delete(cmds, spec);
           }
@@ -375,9 +376,8 @@
     return null;
   }
 
-  private void send(final List<RemoteRefUpdate> cmds, final RefSpec spec)
-      throws IOException {
-    final String src = spec.getSource();
+  private void send(final List<RemoteRefUpdate> cmds, final RefSpec spec,
+      final Ref src) throws IOException {
     final String dst = spec.getDestination();
     final boolean force = spec.isForceUpdate();
     cmds.add(new RemoteRefUpdate(db, src, dst, force, null, null));
@@ -387,7 +387,7 @@
       throws IOException {
     final String dst = spec.getDestination();
     final boolean force = spec.isForceUpdate();
-    cmds.add(new RemoteRefUpdate(db, null, dst, force, null, null));
+    cmds.add(new RemoteRefUpdate(db, (Ref) null, dst, force, null, null));
   }
 
   @Override

pom.xml

diff --git a/pom.xml b/pom.xml
index 24d00bb..89c786b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
   </issueManagement>
 
   <properties>
-    <jgitVersion>0.10.1.62-gbe38185</jgitVersion>
+    <jgitVersion>0.11.3.113-ga490afe</jgitVersion>
     <gwtormVersion>1.1.4</gwtormVersion>
     <gwtjsonrpcVersion>1.2.3</gwtjsonrpcVersion>
     <gwtexpuiVersion>1.2.2</gwtexpuiVersion>