Skip to content

fix(controller): make git push correctly handle "incorrect old value provided" #5315

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

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
+4 −3
Draft

fix(controller): make git push correctly handle "incorrect old value provided" #5315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bb9fc58
Initial plan
Copilot Oct 30, 2025
f76669d
Fix git-push retry for GitLab concurrent promotions
Copilot Oct 30, 2025
c8e4f4e
Complete fix for git-push retry with GitLab
Copilot Oct 30, 2025
36c1059
Update pkg/controller/git/work_tree.go
krancour Nov 5, 2025
0f48ee1
Revert unrelated changes to api/go.sum
Copilot Nov 5, 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
4 changes: 2 additions & 2 deletions pkg/controller/git/work_tree.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,10 +563,10 @@ type PushOptions struct {
PullRebase bool
}

// https://regex101.com/r/aNYjHP/1
// https://regex101.com/r/f7kTjs/1
//
// nolint: lll
var nonFastForwardRegex = regexp.MustCompile(`(?m)^\s*!\s+\[(?:remote )?rejected].+\((?:non-fast-forward|fetch first|cannot lock ref.*)\)\s*$`)
var nonFastForwardRegex = regexp.MustCompile(`(?m)^\s*!\s+\[(?:remote )?rejected].+\((?:non-fast-forward|fetch first|cannot lock ref.*|incorrect old value provided)\)\s*$`)

func (w *workTree) Push(opts *PushOptions) error {
if opts == nil {
Expand Down
3 changes: 2 additions & 1 deletion pkg/controller/git/work_tree_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ func TestNonFastForwardRegex(t *testing.T) {
" ! [rejected] main -> main (fetch first)": true,
" ! [remote rejected] HEAD -> experiment (cannot lock ref 'refs/heads/experiment': is at " +
"7dc98ee9c0b75be429e300bb59b3cf6d091ca9ed but expected 1bdf96c8c868981a0e24c43c98aef09a8970a1b8)": true,
" ! [rejected] HEAD -> experiment (fetch first)": true,
" ! [rejected] HEAD -> experiment (fetch first)": true,
" ! [remote rejected] HEAD -> main (incorrect old value provided)": true,
}

testingPkg.ValidateRegularExpression(t, nonFastForwardRegex, testCases)
Expand Down
Loading