Browse Source

Merge branch 'stable-4.6' into stable-4.7

* stable-4.6:
  Fix feature versions imported by feature org.eclipse.jgit.pgm
  Prepare 4.5.6-SNAPSHOT builds
  JGit v4.5.5.201812240535-r
  Call AdvertiseRefsHook before validating wants

Change-Id: If637694f80dbd1e774d60c672fe78a6500650bb8
Signed-off-by: Jonathan Nieder <jrn@google.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
stable-4.7
Matthias Sohn 6 years ago
parent
commit
193a164925
  1. 4
      org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
  2. 22
      org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java

4
org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml

@ -31,8 +31,8 @@
version="0.0.0"/>
<requires>
<import feature="org.eclipse.jgit" version="4.7.1" match="equivalent"/>
<import feature="org.eclipse.jgit.lfs" version="4.7.1" match="equivalent"/>
<import feature="org.eclipse.jgit" version="4.7.7" match="equivalent"/>
<import feature="org.eclipse.jgit.lfs" version="4.7.7" match="equivalent"/>
</requires>
<plugin

22
org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java

@ -82,7 +82,6 @@ import org.eclipse.jgit.lib.NullProgressMonitor;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.ProgressMonitor;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.RefDatabase;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.AsyncRevObjectQueue;
import org.eclipse.jgit.revwalk.DepthWalk;
@ -707,8 +706,14 @@ public class UploadPack {
}
private Map<String, Ref> getAdvertisedOrDefaultRefs() throws IOException {
if (refs == null)
setAdvertisedRefs(db.getRefDatabase().getRefs(RefDatabase.ALL));
if (refs != null) {
return refs;
}
advertiseRefsHook.advertiseRefs(this);
if (refs == null) {
setAdvertisedRefs(db.getRefDatabase().getRefs(ALL));
}
return refs;
}
@ -867,15 +872,7 @@ public class UploadPack {
*/
public void sendAdvertisedRefs(final RefAdvertiser adv) throws IOException,
ServiceMayNotContinueException {
try {
advertiseRefsHook.advertiseRefs(this);
} catch (ServiceMayNotContinueException fail) {
if (fail.getMessage() != null) {
adv.writeOne("ERR " + fail.getMessage()); //$NON-NLS-1$
fail.setOutput();
}
throw fail;
}
Map<String, Ref> advertisedOrDefaultRefs = getAdvertisedOrDefaultRefs();
adv.init(db);
adv.advertiseCapability(OPTION_INCLUDE_TAG);
@ -900,7 +897,6 @@ public class UploadPack {
adv.advertiseCapability(OPTION_ALLOW_REACHABLE_SHA1_IN_WANT);
adv.advertiseCapability(OPTION_AGENT, UserAgent.get());
adv.setDerefTags(true);
Map<String, Ref> advertisedOrDefaultRefs = getAdvertisedOrDefaultRefs();
findSymrefs(adv, advertisedOrDefaultRefs);
advertised = adv.send(advertisedOrDefaultRefs);
if (adv.isEmpty())

Loading…
Cancel
Save