Skip to content

Fix false URL mismatch detection with insteadOf #3718

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

Merged
CerealBoy merged 2 commits into from
Mar 3, 2026
+82 −5
Merged

Fix false URL mismatch detection with insteadOf #3718

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41bb1f7
Fix false URL mismatch detection with insteadOf
rajatvig Feb 24, 2026
acb59be
fix: fallback to earlier method when origin has multiple URIs
rajatvig Feb 25, 2026
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
2 changes: 1 addition & 1 deletion internal/job/checkout.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ func (e *Executor) updateRemoteURL(ctx context.Context, gitDir, repository strin

// First check what the existing remote is, for both logging and debugging
// purposes.
args := []string{"remote", "get-url", "origin"}
args := []string{"config", "--get", "remote.origin.url"}
if gitDir != "" {
args = append([]string{"--git-dir", gitDir}, args...)
}
Expand Down
6 changes: 3 additions & 3 deletions internal/job/integration/checkout_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ func TestCheckingOutLocalGitProjectWithShortCommitHash(t *testing.T) {
// Git should attempt to fetch the shortHash, but fail. Then fallback to fetching
// all the heads and tags and checking out the short commit hash.
git.ExpectAll([][]any{
{"remote", "get-url", "origin"},
{"config", "--get", "remote.origin.url"},
{"clean", "-ffxdq"},
{"fetch", "--", "origin", shortCommitHash},
{"config", "remote.origin.fetch"},
Expand Down Expand Up @@ -615,7 +615,7 @@ func TestCheckoutErrorIsRetried(t *testing.T) {

// But assert which ones are called
git.ExpectAll([][]any{
{"remote", "get-url", "origin"},
{"config", "--get", "remote.origin.url"},
{"clean", "-fdq"},
{"fetch", "-v", "--", "origin", "main"},
{"checkout", "-f", "FETCH_HEAD"},
Expand Down Expand Up @@ -678,7 +678,7 @@ func TestFetchErrorIsRetried(t *testing.T) {

// But assert which ones are called
git.ExpectAll([][]any{
{"remote", "get-url", "origin"},
{"config", "--get", "remote.origin.url"},
{"clean", "-ffxdq"},
{"fetch", "-v", "--prune", "--depth=1", "--", "origin", "main"},
{"clone", "-v", "--depth=1", "--", tester.Repo.Path, "."},
Expand Down