Merge branch 'stable-4.5' into stable-4.6
* stable-4.5: Prepare 4.5.6-SNAPSHOT builds JGit v4.5.5.201812240535-r Call AdvertiseRefsHook before validating wants Change-Id: I0fd67ddd9c4966c20d82cdfe78b2f9d4898b4665 Signed-off-by: Jonathan Nieder <jrn@google.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
commit
4ad74d2f9b
|
@ -82,7 +82,6 @@
|
||||||
import org.eclipse.jgit.lib.ObjectId;
|
import org.eclipse.jgit.lib.ObjectId;
|
||||||
import org.eclipse.jgit.lib.ProgressMonitor;
|
import org.eclipse.jgit.lib.ProgressMonitor;
|
||||||
import org.eclipse.jgit.lib.Ref;
|
import org.eclipse.jgit.lib.Ref;
|
||||||
import org.eclipse.jgit.lib.RefDatabase;
|
|
||||||
import org.eclipse.jgit.lib.Repository;
|
import org.eclipse.jgit.lib.Repository;
|
||||||
import org.eclipse.jgit.revwalk.AsyncRevObjectQueue;
|
import org.eclipse.jgit.revwalk.AsyncRevObjectQueue;
|
||||||
import org.eclipse.jgit.revwalk.DepthWalk;
|
import org.eclipse.jgit.revwalk.DepthWalk;
|
||||||
|
@ -707,8 +706,14 @@ public PackStatistics getStatistics() {
|
||||||
}
|
}
|
||||||
|
|
||||||
private Map<String, Ref> getAdvertisedOrDefaultRefs() throws IOException {
|
private Map<String, Ref> getAdvertisedOrDefaultRefs() throws IOException {
|
||||||
if (refs == null)
|
if (refs != null) {
|
||||||
setAdvertisedRefs(db.getRefDatabase().getRefs(RefDatabase.ALL));
|
return refs;
|
||||||
|
}
|
||||||
|
|
||||||
|
advertiseRefsHook.advertiseRefs(this);
|
||||||
|
if (refs == null) {
|
||||||
|
setAdvertisedRefs(db.getRefDatabase().getRefs(ALL));
|
||||||
|
}
|
||||||
return refs;
|
return refs;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -867,15 +872,7 @@ private void verifyClientShallow()
|
||||||
*/
|
*/
|
||||||
public void sendAdvertisedRefs(final RefAdvertiser adv) throws IOException,
|
public void sendAdvertisedRefs(final RefAdvertiser adv) throws IOException,
|
||||||
ServiceMayNotContinueException {
|
ServiceMayNotContinueException {
|
||||||
try {
|
Map<String, Ref> advertisedOrDefaultRefs = getAdvertisedOrDefaultRefs();
|
||||||
advertiseRefsHook.advertiseRefs(this);
|
|
||||||
} catch (ServiceMayNotContinueException fail) {
|
|
||||||
if (fail.getMessage() != null) {
|
|
||||||
adv.writeOne("ERR " + fail.getMessage()); //$NON-NLS-1$
|
|
||||||
fail.setOutput();
|
|
||||||
}
|
|
||||||
throw fail;
|
|
||||||
}
|
|
||||||
|
|
||||||
adv.init(db);
|
adv.init(db);
|
||||||
adv.advertiseCapability(OPTION_INCLUDE_TAG);
|
adv.advertiseCapability(OPTION_INCLUDE_TAG);
|
||||||
|
@ -900,7 +897,6 @@ public void sendAdvertisedRefs(final RefAdvertiser adv) throws IOException,
|
||||||
adv.advertiseCapability(OPTION_ALLOW_REACHABLE_SHA1_IN_WANT);
|
adv.advertiseCapability(OPTION_ALLOW_REACHABLE_SHA1_IN_WANT);
|
||||||
adv.advertiseCapability(OPTION_AGENT, UserAgent.get());
|
adv.advertiseCapability(OPTION_AGENT, UserAgent.get());
|
||||||
adv.setDerefTags(true);
|
adv.setDerefTags(true);
|
||||||
Map<String, Ref> advertisedOrDefaultRefs = getAdvertisedOrDefaultRefs();
|
|
||||||
findSymrefs(adv, advertisedOrDefaultRefs);
|
findSymrefs(adv, advertisedOrDefaultRefs);
|
||||||
advertised = adv.send(advertisedOrDefaultRefs);
|
advertised = adv.send(advertisedOrDefaultRefs);
|
||||||
if (adv.isEmpty())
|
if (adv.isEmpty())
|
||||||
|
|
Loading…
Reference in New Issue