Skip to content

Also do shallow fetch for NEU repo #1672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
layou233 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Also do shallow fetch for NEU repo #1672

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
17ebc83
Use fetch --depth 1 & hard reset to update
layou233 Sep 5, 2025
fae331a
Workaround for keeping uncommited local changes
layou233 Sep 5, 2025
204f0fc
Resolve conflict by using theirs
layou233 Sep 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 25 additions & 11 deletions src/main/java/de/hysky/skyblocker/utils/NEURepoManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,13 @@
import org.apache.commons.lang3.function.Consumers;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.MergeCommand;
import org.eclipse.jgit.api.PullResult;
import org.eclipse.jgit.api.ResetCommand;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.api.errors.TransportException;
import org.eclipse.jgit.errors.RepositoryNotFoundException;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.merge.ContentMergeStrategy;
import org.eclipse.jgit.merge.MergeStrategy;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -102,29 +105,40 @@ private static CompletableFuture<Boolean> loadRepository() {
try {
if (Files.isDirectory(NEURepoManager.LOCAL_REPO_DIR)) {
try (Git localRepo = Git.open(NEURepoManager.LOCAL_REPO_DIR.toFile())) {
PullResult result = localRepo.pull().setRebase(false).setFastForward(MergeCommand.FastForwardMode.FF_ONLY).call();
if (result.isSuccessful()) {
LOGGER.info("[Skyblocker NEU Repo] NEU Repository updated with merge status: {}", result.getMergeResult().getMergeStatus());
} else {
LOGGER.error("[Skyblocker NEU Repo] Update failed with merge status: {}. Downloading new repository", result.getMergeResult().getMergeStatus());
Scheduler.INSTANCE.schedule(() -> deleteAndDownloadRepositoryInternal(MinecraftClient.getInstance().player), 1);
success = false;
boolean stashed = localRepo.stashCreate().call() != null;
localRepo.fetch()
.setRefSpecs("+refs/heads/master:refs/remotes/origin/master")
.setThin(true)
.setDepth(1)
.call();
Ref ref = localRepo.reset()
.setRef("refs/remotes/origin/master")
.setMode(ResetCommand.ResetType.HARD)
.disableRefLog(true)
.call();
if (stashed) {
localRepo.stashApply()
.setContentMergeStrategy(ContentMergeStrategy.THEIRS)
.call();
localRepo.stashDrop().call();
LOGGER.info("[Skyblocker NEU Repo] Auto stash has been applied to the NEU Repository");
}
LOGGER.info("[Skyblocker NEU Repo] NEU Repository was updated to {}", ref.getObjectId().getName());
}
} else {
Git.cloneRepository()
.setURI(REMOTE_REPO_URL)
.setDirectory(NEURepoManager.LOCAL_REPO_DIR.toFile())
.setBranchesToClone(List.of("refs/heads/master"))
.setBranch("refs/heads/master")
.setDepth(1) // do shallow clone
.setDepth(1)
.call().close();
LOGGER.info("[Skyblocker NEU Repo] NEU Repository Downloaded");
}
} catch (TransportException e) {
LOGGER.error("[Skyblocker NEU Repo] Transport operation failed. Most likely unable to connect to the remote NEU repo on github", e);
success = false;
} catch (RepositoryNotFoundException e) {
} catch (GitAPIException | RepositoryNotFoundException e) {
LOGGER.warn("[Skyblocker NEU Repo] Local NEU Repository not found or corrupted, downloading new one", e);
Scheduler.INSTANCE.schedule(() -> deleteAndDownloadRepositoryInternal(MinecraftClient.getInstance().player), 1);
success = false;
Expand Down
Loading