Returns branch name as main if ref as refs-heads-main (#392)

openshift-pipelines · Dec 10, 2021 · 0261621 · 0261621
1 parent 69e49b6
commit 0261621
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 22 deletions.
diff --git a/pkg/formatting/vcs.go b/pkg/formatting/vcs.go
@@ -12,6 +12,9 @@ func SanitizeBranch(s string) string {
 	if strings.HasPrefix(s, "refs/heads/") {
 		return strings.TrimPrefix(s, "refs/heads/")
 	}
+	if strings.HasPrefix(s, "refs-heads-") {
+		return strings.TrimPrefix(s, "refs-heads-")
+	}
 	return s
 }
 

diff --git a/pkg/formatting/vcs_test.go b/pkg/formatting/vcs_test.go
@@ -97,6 +97,11 @@ func TestSanitizeBranch(t *testing.T) {
 			args: args{s: "refs/tags/1.0"},
 			want: "refs/tags/1.0",
 		},
+		{
+			name: "sanitize main ref",
+			args: args{s: "refs-heads-main"},
+			want: "main",
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

diff --git a/vendor/github.com/AlecAivazis/survey/v2/terminal/LICENSE.txt b/vendor/github.com/AlecAivazis/survey/v2/terminal/LICENSE.txt