Skip to content

Retry commit-only ref updates when head moves #11

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
arpitjain099 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Retry commit-only ref updates when head moves #11

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
36 changes: 28 additions & 8 deletions github-tree-push-module/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -891,8 +891,10 @@ class GitHubTreePush {

/**
* Push all the files added to the tree to the repository
*
* @param {boolean} [retryOnRefUpdateConflict] retry once if a ref update race occurs
*/
async treePush() {
async treePush(retryOnRefUpdateConflict = true) {
this.lastRunStats = {
Name: `treePush - ${this.options.commit_message || "(No commit message)"}`
};
Expand Down Expand Up @@ -1058,13 +1060,31 @@ class GitHubTreePush {
} else {
//Just a simple commit on this branch
//https://docs.github.com/en/rest/reference/git#update-a-reference
await this.__postSomeJson(
`/git/refs/heads/${this.options.base}`,
{
sha: commit.sha
},
{ method: "PATCH" }
);
try {
await this.__postSomeJson(
`/git/refs/heads/${this.options.base}`,
{
sha: commit.sha
},
{ method: "PATCH" }
);
} catch (error) {
const errorMessage = `${error?.message || ""}`;
const isRefUpdateConflict =
errorMessage.includes("422") &&
errorMessage.includes("/git/refs/heads/") &&
(errorMessage.includes("Reference update failed") ||
errorMessage.includes("Update is not a fast forward"));

if (retryOnRefUpdateConflict && isRefUpdateConflict) {
console.log(
`Base branch moved while updating ${this.options.base}. Retrying once on latest head.`
);
return this.treePush(false);
}

throw error;
}
}
}
}
Expand Down