private boolean isNothingToCommit(PullResult pullResult) { return pullResult.getNewRef().equals(pullResult.getOldRef()); }
private AutoCloseableIterator<DiffEntry> resolveDiff(Context geogig, PullResult result) { AutoCloseableIterator<DiffEntry> iter; if (result.getOldRef() != null && result.getOldRef().equals(result.getNewRef())) { iter = null; } else { if (result.getOldRef() == null) { iter = geogig.command(DiffOp.class).setNewVersion(result.getNewRef().getObjectId()) .setOldVersion(ObjectId.NULL).call(); } else { iter = geogig.command(DiffOp.class).setNewVersion(result.getNewRef().getObjectId()) .setOldVersion(result.getOldRef().getObjectId()).call(); } } return iter; } }
FetchResultPrinter.print(fetchResult, console); final Ref oldRef = result.getOldRef(); final Ref newRef = result.getNewRef();
FetchResultPrinter.print(fetchResult, console); final Ref oldRef = result.getOldRef(); final Ref newRef = result.getNewRef();
FetchResultPrinter.print(fetchResult, console); final Ref oldRef = result.getOldRef(); final Ref newRef = result.getNewRef();
@Test public void testPullRefspecForce() throws Exception { // Add a commit to the remote insertAndAdd(remoteGeogig.geogig, lines3); RevCommit commit = remoteGeogig.geogig.command(CommitOp.class).call(); expectedMaster.addFirst(commit); // Pull the commit PullOp pull = pullOp(); // fetch remote's master onto new ref refs/remotes/origin/newbranch, then pull from there pull.addRefSpec("+master:newbranch"); PullResult result = pull.setRebase(true).call(); Optional<Ref> fetchedToRef = getRef(localGeogig.repo, "refs/remotes/origin/newbranch"); assertTrue(fetchedToRef.isPresent()); List<RevCommit> logged = log(localGeogig.repo); assertEquals(expectedMaster, logged); Ref oldRef = result.getOldRef(); Ref newRef = result.getNewRef(); assertEquals("refs/heads/master", oldRef.getName()); assertEquals("refs/heads/master", newRef.getName()); assertEquals(fetchedToRef.get().getObjectId(), newRef.getObjectId()); }