Skip to content

Commit

Permalink
feat(cli): Support for separate branch
Browse files Browse the repository at this point in the history
Signed-off-by: Mihai Galos <mihai.galos@rbinternational.com>
  • Loading branch information
mihaigalos committed Feb 1, 2024
1 parent 9e9b5f4 commit 4c56116
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions internal/api/types/v1alpha1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,13 @@ func repoURLFromWriteOrRead(g *v1alpha1.GitCommit) string {
}
}

func branchFromWriteOrRead(g *v1alpha1.GitCommit) string {
r := g.GetWriteBranch()
if r == "" {
r = g.GetBranch()
}
}

func FromGitCommitProto(g *v1alpha1.GitCommit) *kargoapi.GitCommit {
if g == nil {
return nil
Expand All @@ -227,7 +234,7 @@ func FromGitCommitProto(g *v1alpha1.GitCommit) *kargoapi.GitCommit {
return &kargoapi.GitCommit{
RepoURL: g.repoURLFromWriteOrRead(),
ID: g.GetId(),
Branch: g.GetBranch(),
Branch: g.branchFromWriteOrRead(),
HealthCheckCommit: g.GetHealthCheckCommit(),
}
}
Expand Down Expand Up @@ -330,7 +337,7 @@ func FromGitSubscriptionProto(s *v1alpha1.GitSubscription) *kargoapi.GitSubscrip
}
return &kargoapi.GitSubscription{
RepoURL: s.repoURLFromWriteOrRead(),
Branch: s.GetBranch(),
Branch: s.branchFromWriteOrRead(),
}
}

Expand Down

0 comments on commit 4c56116

Please sign in to comment.