Skip to content

Commit 8d7ed7a

Browse files
authored
Merge pull request #973 from fluxcd/fix-972
Fix checkout reference name not taken into account
2 parents b72c04d + 67378a6 commit 8d7ed7a

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

internal/source/source.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,7 @@ func (sm *SourceManager) CheckoutSource(ctx context.Context, options ...Checkout
247247
cloneCfg.SemVer = sm.srcCfg.checkoutRef.SemVer
248248
cloneCfg.Commit = sm.srcCfg.checkoutRef.Commit
249249
cloneCfg.Branch = sm.srcCfg.checkoutRef.Branch
250+
cloneCfg.RefName = sm.srcCfg.checkoutRef.Name
250251
}
251252
// Apply checkout configurations.
252253
for _, o := range options {

internal/source/source_test.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,17 @@ func test_sourceManager_CheckoutSource(t *testing.T, proto string) {
261261
wantErr: false,
262262
wantRef: "main",
263263
},
264+
{
265+
name: "checkout for reference name",
266+
autoGitSpec: &imagev1.GitSpec{
267+
Push: &imagev1.PushSpec{Branch: "main"},
268+
Checkout: &imagev1.GitCheckoutSpec{
269+
Reference: sourcev1.GitRepositoryRef{Name: "refs/heads/main"},
270+
},
271+
},
272+
wantErr: false,
273+
wantRef: "main",
274+
},
264275
{
265276
name: "checkout for different push branch",
266277
autoGitSpec: &imagev1.GitSpec{

0 commit comments

Comments
 (0)