Skip to content

Add retry logic to checkout and submoduleUpdate for partial clone resilience #2392

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
jasonwbarnett wants to merge 1 commit into
base: main
Choose a base branch
from
+24 −4
Open

Add retry logic to checkout and submoduleUpdate for partial clone resilience #2392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 12 additions & 2 deletions dist/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,14 @@ class GitCommandManager {
else {
args.push(ref);
}
yield this.execGit(args);
// Retry checkout because it can trigger network I/O when using partial
// clones (filter=blob:none). In that mode git lazily fetches missing
// blobs from the promisor remote during checkout, so a transient network
// failure would otherwise surface as a hard error here.
const that = this;
yield retryHelper.execute(() => __awaiter(this, void 0, void 0, function* () {
yield that.execGit(args);
}));
});
}
checkoutDetach() {
Expand Down Expand Up @@ -990,7 +997,10 @@ class GitCommandManager {
if (recursive) {
args.push('--recursive');
}
yield this.execGit(args);
const that = this;
yield retryHelper.execute(() => __awaiter(this, void 0, void 0, function* () {
yield that.execGit(args);
}));
});
}
submoduleStatus() {
Expand Down
14 changes: 12 additions & 2 deletions src/git-command-manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,14 @@ class GitCommandManager {
args.push(ref)
}

await this.execGit(args)
// Retry checkout because it can trigger network I/O when using partial
// clones (filter=blob:none). In that mode git lazily fetches missing
// blobs from the promisor remote during checkout, so a transient network
// failure would otherwise surface as a hard error here.
const that = this
await retryHelper.execute(async () => {
await that.execGit(args)
})
}

async checkoutDetach(): Promise<void> {
Expand Down Expand Up @@ -457,7 +464,10 @@ class GitCommandManager {
args.push('--recursive')
}

await this.execGit(args)
const that = this
await retryHelper.execute(async () => {
await that.execGit(args)
})
}

async submoduleStatus(): Promise<boolean> {
Expand Down