adam/open-swe
1
0
Fork 0
mirror of https://github.com/Sea-Haven-Industries/open-swe.git synced 2026-09-30 11:33:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Pull branch if push errors (#534)

Browse source
This commit is contained in:
Brace Sproul 2025-07-25 15:44:03 -07:00 • committed by GitHub
parent 3ec90ef6e6
commit 2d17904153
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
apps/open-swe/src/utils/github/git.ts
View file

@ -128,16 +128,34 @@ export async function checkoutBranchAndCommit(
);
if (pushRes instanceof Error) {
logger.info("Failed to push changes, attempting to pull and push again");
// attempt to git pull, then push again
await sandbox.git.pull(
absoluteRepoDir,
"git",
options.githubInstallationToken,
);
logger.info("Successfully pulled changes. Pushing again.");
const pushRes2 = await withRetry(
async () => {
return await sandbox.git.push(
absoluteRepoDir,
"git",
options.githubInstallationToken,
);
},
{ retries: 3, delay: 0 },
);
const gitStatus = await sandbox.git.status(absoluteRepoDir);
const errorFields = {
...(pushRes instanceof Error
...(pushRes2 instanceof Error
? {
name: pushRes.name,
message: pushRes.message,
stack: pushRes.stack,
cause: pushRes.cause,
name: pushRes2.name,
message: pushRes2.message,
stack: pushRes2.stack,
cause: pushRes2.cause,
}
: pushRes),
: pushRes2),
};
logger.error("Failed to push changes", {
...errorFields,