chore: Enhance text consistency across codebase

chmouel · Gemini · chmouel · commit cc7ecb642961 · 2025-09-29T10:34:43.000+02:00
- Standardized "Pipelines as Code" to "Pipelines-as-Code" in CLI command
  descriptions.
- Corrected typos and grammatical errors in command help texts and flag
  descriptions.
- Improved capitalization for proper nouns like "URI", "Kubernetes",
  "Tekton", "HTTPS", and "Hub" in error messages and log outputs.
- Refined error messages for clarity when remote tasks or pipelines are
  not found.
- Updated internal comments for better readability and grammar.

Co-authored-by: Gemini &lt;gemini@google.com&gt;
Signed-off-by: Chmouel Boudjnah &lt;chmouel@redhat.com&gt;
diff --git a/hack/update-golden.sh b/hack/update-golden.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
-# This will run `go test a/package -test.update-golden=true` on all packages that are importing `gotest.tools/v3/golden`
-# This will update the golden files with the current output.
-# Run this only when you are sure the output is meant to change.
-go test $(go list -f '{{ .ImportPath }} {{ .TestImports }}' ./... | grep gotest.tools/v3/golden | awk '{print $1}' | tr '\n' ' ') -test.update-golden=true
+# This script runs `go test -test.update-golden=true` for all packages that import `gotest.tools/v3/golden`.
+# It updates golden files to match the current test output.
+# Use this only when you intend to update the expected output.
+# Note: This script targets unit tests only. To update golden files for e2e tests,
+# run the e2e tests directly with the appropriate variables environemnt set and the -test.update-golden=true flag.
+go test $(go list -f '{{ .ImportPath }} {{ .TestImports }}' ./pkg/... | grep gotest.tools/v3/golden | awk '{print $1}' | tr '\n' ' ') -test.update-golden=true
diff --git a/pkg/cmd/tknpac/bootstrap/bootstrap.go b/pkg/cmd/tknpac/bootstrap/bootstrap.go
@@ -71,12 +71,12 @@ const indexTmpl = `
 `
 
 var successTmpl = fmt.Sprintf(`
-<html><body>You have <span style=\"color: green\">successfully</span> created a new GitHub application, go back to the %s pac cli to finish the installation.</body></html>
+<html><body>You have <span style=\"color: green\">successfully</span> created a new GitHub application. Return to the %s pac CLI to finish the installation.</body></html>
 `, settings.TknBinaryName)
 
 func install(ctx context.Context, run *params.Run, opts *bootstrapOpts) error {
 	if !opts.forceInstall {
-		fmt.Fprintln(opts.ioStreams.Out, "=> Checking if Pipelines as Code is installed.")
+		fmt.Fprintln(opts.ioStreams.Out, "=> Checking if Pipelines-as-Code is installed.")
 	}
 	tektonInstalled, err := checkPipelinesInstalled(run)
 	if err != nil {
diff --git a/pkg/cmd/tknpac/bootstrap/bootstrap_test.go b/pkg/cmd/tknpac/bootstrap/bootstrap_test.go
@@ -49,7 +49,7 @@ func TestInstall(t *testing.T) {
 	err := install(ctx, run, opts)
 	// get an error because i need to figure out how to fake dynamic client
 	assert.Assert(t, err != nil)
-	assert.Equal(t, "=> Checking if Pipelines as Code is installed.\n", out.String())
+	assert.Equal(t, "=> Checking if Pipelines-as-Code is installed.\n", out.String())
 }
 
 func TestDetectPacInstallation(t *testing.T) {
diff --git a/pkg/cmd/tknpac/create/repository.go b/pkg/cmd/tknpac/create/repository.go
@@ -216,7 +216,7 @@ func getRepoURL(opts *RepoOptions) error {
 		return nil
 	}
 
-	q := "Enter the Git repository url "
+	q := "Enter the Git repository URL "
 	var err error
 	if opts.GitInfo.URL != "" {
 		opts.GitInfo.URL, err = cleanupGitURL(opts.GitInfo.URL)
diff --git a/pkg/cmd/tknpac/create/root.go b/pkg/cmd/tknpac/create/root.go
@@ -10,8 +10,8 @@ func Root(clients *params.Run, ioStreams *cli.IOStreams) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:          "create",
 		Aliases:      []string{},
-		Short:        "Create Pipelines as Code resources",
-		Long:         `Create Pipelines as Code resources`,
+		Short:        "Create Pipelines-as-Code resources",
+		Long:         `Create Pipelines-as-Code resources such as repositories, webhook configurations, and other related components. This command helps you set up and configure Pipelines-as-Code in your cluster.`,
 		SilenceUsage: true,
 		Annotations: map[string]string{
 			"commandType": "main",
diff --git a/pkg/cmd/tknpac/create/testdata/TestGenerateTemplate-WithGitInfo.golden b/pkg/cmd/tknpac/create/testdata/TestGenerateTemplate-WithGitInfo.golden
@@ -4,14 +4,14 @@ kind: PipelineRun
 metadata:
   name: tartanpion
   annotations:
-    # The event we are targeting as seen from the webhook payload
+    # The event we target as seen from the webhook payload
     # this can be an array too, i.e: [pull_request, push]
     pipelinesascode.tekton.dev/on-event: "[pull_request, push]"
 
-    # The branch or tag we are targeting (ie: main, refs/tags/*)
+    # The branch or tag we target (i.e., main, refs/tags/*)
     pipelinesascode.tekton.dev/on-target-branch: "[main]"
 
-    # Fetch the git-clone task from hub, we are able to reference later on it
+    # Fetch the git-clone task from hub, we can reference later on it
     # with taskRef and it will automatically be embedded into our pipeline.
     pipelinesascode.tekton.dev/task: "git-clone"
 
@@ -28,8 +28,8 @@ metadata:
     pipelinesascode.tekton.dev/max-keep-runs: "5"
 spec:
   params:
-    # The variable with brackets are special to Pipelines as Code
-    # They will automatically be expanded with the events from Github.
+    # The variable with brackets are special to Pipelines-as-Code
+    # They will automatically be expanded with the events from GitHub.
     - name: repo_url
       value: "{{ repo_url }}"
     - name: revision
diff --git a/pkg/cmd/tknpac/create/testdata/TestGenerateTemplate-WithoutGitInfo.golden b/pkg/cmd/tknpac/create/testdata/TestGenerateTemplate-WithoutGitInfo.golden
@@ -4,14 +4,14 @@ kind: PipelineRun
 metadata:
   name: tartanpion
   annotations:
-    # The event we are targeting as seen from the webhook payload
+    # The event we target as seen from the webhook payload
     # this can be an array too, i.e: [pull_request, push]
     pipelinesascode.tekton.dev/on-event: "[pull_request, push]"
 
-    # The branch or tag we are targeting (ie: main, refs/tags/*)
+    # The branch or tag we target (i.e., main, refs/tags/*)
     pipelinesascode.tekton.dev/on-target-branch: "[main]"
 
-    # Fetch the git-clone task from hub, we are able to reference later on it
+    # Fetch the git-clone task from hub, we can reference later on it
     # with taskRef and it will automatically be embedded into our pipeline.
     pipelinesascode.tekton.dev/task: "git-clone"
 
@@ -28,8 +28,8 @@ metadata:
     pipelinesascode.tekton.dev/max-keep-runs: "5"
 spec:
   params:
-    # The variable with brackets are special to Pipelines as Code
-    # They will automatically be expanded with the events from Github.
+    # The variable with brackets are special to Pipelines-as-Code
+    # They will automatically be expanded with the events from GitHub.
     - name: repo_url
       value: "{{ repo_url }}"
     - name: revision
diff --git a/pkg/cmd/tknpac/deleterepo/delete.go b/pkg/cmd/tknpac/deleterepo/delete.go
@@ -26,7 +26,7 @@ func repositoryCommand(run *params.Run, ioStreams *cli.IOStreams) *cobra.Command
 	cmd := &cobra.Command{
 		Args:    cobra.MinimumNArgs(0),
 		Use:     "repository",
-		Short:   "Delete a Pipelines as Code Repository or multiple of them",
+		Short:   "Delete a Pipelines-as-Code repository or multiple repositories",
 		Long:    longHelp,
 		Aliases: []string{"repo"},
 		ValidArgsFunction: func(_ *cobra.Command, args []string, _ string) ([]string, cobra.ShellCompDirective) {
diff --git a/pkg/cmd/tknpac/deleterepo/root.go b/pkg/cmd/tknpac/deleterepo/root.go
@@ -10,8 +10,8 @@ func Root(clients *params.Run, ioStreams *cli.IOStreams) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:          "delete",
 		Aliases:      []string{"rm"},
-		Short:        "Delete Pipelines as Code resources",
-		Long:         `Delete Pipelines as Code resources`,
+		Short:        "Delete Pipelines-as-Code resources",
+		Long:         `Delete Pipelines-as-Code resources`,
 		SilenceUsage: true,
 		Annotations: map[string]string{
 			"commandType": "main",
diff --git a/pkg/cmd/tknpac/generate/generate.go b/pkg/cmd/tknpac/generate/generate.go
@@ -55,13 +55,13 @@ func Command(_ *params.Run, ioStreams *cli.IOStreams) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:     "generate",
 		Aliases: []string{"gen"},
-		Short:   "Generate PipelineRun",
+		Short:   "Generate a PipelineRun",
 		RunE: func(_ *cobra.Command, _ []string) error {
 			gopt.CLIOpts = cli.NewCliOptions()
 			gopt.IOStreams.SetColorEnabled(!gopt.CLIOpts.NoColoring)
 
 			if gopt.generateWithClusterTask {
-				return fmt.Errorf("ClusterTasks is deprecated and not available anymore")
+				return fmt.Errorf("ClusterTasks are deprecated and not available anymore")
 			}
 			cwd, err := os.Getwd()
 			if err != nil {
@@ -75,17 +75,17 @@ func Command(_ *params.Run, ioStreams *cli.IOStreams) *cobra.Command {
 		},
 	}
 	cmd.PersistentFlags().StringVar(&gopt.Event.BaseBranch, "branch", "",
-		"The target branch for the PipelineRun to handle (eg: main, nightly)")
+		"Target branch for the PipelineRun to handle (e.g., main, nightly)")
 	cmd.PersistentFlags().StringVar(&gopt.Event.EventType, "event-type", "",
-		"The event type of the repository event to handle (eg: pull_request, push)")
+		"Event type of the repository event to handle (e.g., pull_request, push)")
 	cmd.PersistentFlags().StringVar(&gopt.pipelineRunName, "pipeline-name", "",
-		"The pipeline name")
+		"Pipeline name")
 	cmd.PersistentFlags().StringVarP(&gopt.FileName, "file-name", "f", "",
-		"The file name location")
+		"File name location")
 	cmd.PersistentFlags().BoolVar(&gopt.overwrite, "overwrite", false,
-		"Whether to overwrite the file if it exist")
+		"Whether to overwrite the file if it exists")
 	cmd.PersistentFlags().StringVarP(&gopt.language, "language", "l", "",
-		"Generate for this programming language")
+		"Generate template for this programming language")
 	cmd.PersistentFlags().BoolVarP(&gopt.generateWithClusterTask, "use-clustertasks", "", false,
 		"Deprecated, not available anymore")
 	_ = cmd.PersistentFlags().MarkDeprecated("use-clustertasks", "This flag will be removed in a future release")
@@ -148,9 +148,9 @@ func (o *Opts) branchOrTag() error {
 	o.Event.BaseBranch = mainBranch
 
 	if o.Event.EventType == triggertype.PullRequest.String() {
-		msg = "Enter the target GIT branch for the Pull Request (default: %s): "
+		msg = "Enter the target Git branch for the Pull Request (default: %s): "
 	} else if o.Event.EventType == "push" {
-		msg = "Enter a target GIT branch or a tag for the push (default: %s)"
+		msg = "Enter a target Git branch or tag for the push (default: %s)"
 	}
 
 	if err := prompt.SurveyAskOne(
@@ -207,17 +207,16 @@ func (o *Opts) samplePipeline(recreateTemplate bool) error {
 	if _, err := os.Stat(fpath); !os.IsNotExist(err) && !o.overwrite {
 		if recreateTemplate {
 			var overwrite bool
-			msg := fmt.Sprintf("There is already a file named: %s would you like me to override it?", relpath)
+			msg := fmt.Sprintf("A file named %s already exists. Would you like to override it?", relpath)
 			if err := prompt.SurveyAskOne(&survey.Confirm{Message: msg, Default: false}, &overwrite); err != nil {
 				return err
 			}
 			if !overwrite {
-				fmt.Fprintf(o.IOStreams.ErrOut, "%s Not overwriting file, exiting...\n", cs.WarningIcon())
-				fmt.Fprintf(o.IOStreams.ErrOut, "%s Feel free to use the -f flag if you want to target another file name\n...", cs.InfoIcon())
+				fmt.Fprintf(o.IOStreams.ErrOut, "%s File not overwritten, exiting...\n", cs.WarningIcon())
+				fmt.Fprintf(o.IOStreams.ErrOut, "%s Use the -f flag to specify a different file name.\n", cs.InfoIcon())
 			}
 		} else {
-			fmt.Fprintf(o.IOStreams.Out, "%s There is already a file named: %s, skipping template generation, feel free to use \"%s pac generate\" command to generate sample template.\n", cs.InfoIcon(), relpath,
-				settings.TknBinaryName)
+			fmt.Fprintf(o.IOStreams.Out, "%s File %s already exists, skipping template generation. Use \"%s pac generate\" to generate a sample template.\n", cs.InfoIcon(), relpath, settings.TknBinaryName)
 		}
 		return nil
 	}
diff --git a/pkg/cmd/tknpac/generate/template.go b/pkg/cmd/tknpac/generate/template.go
@@ -64,7 +64,7 @@ func (o *Opts) detectLanguage() (string, error) {
 		for _, f := range v.detectionFiles {
 			fpath := filepath.Join(o.GitInfo.TopLevelPath, f)
 			if _, err := os.Stat(fpath); !os.IsNotExist(err) {
-				fmt.Fprintf(o.IOStreams.Out, "%s We have detected your repository using the programming language %s.\n",
+				fmt.Fprintf(o.IOStreams.Out, "%s We detected your repository uses the %s programming language.\n",
 					cs.SuccessIcon(),
 					cs.Bold(cases.Title(language.Und, cases.NoLower).String(t)),
 				)
diff --git a/pkg/cmd/tknpac/generate/templates/generic.yaml b/pkg/cmd/tknpac/generate/templates/generic.yaml
@@ -4,14 +4,14 @@ kind: PipelineRun
 metadata:
   name: pipelinerun-generic
   annotations:
-    # The event we are targeting as seen from the webhook payload
+    # The event we target as seen from the webhook payload
     # this can be an array too, i.e: [pull_request, push]
     pipelinesascode.tekton.dev/on-event: "pull_request"
 
-    # The branch or tag we are targeting (ie: main, refs/tags/*)
+    # The branch or tag we target (i.e., main, refs/tags/*)
     pipelinesascode.tekton.dev/on-target-branch: "main"
 
-    # Fetch the git-clone task from hub, we are able to reference later on it
+    # Fetch the git-clone task from hub, we can reference later on it
     # with taskRef and it will automatically be embedded into our pipeline.
     pipelinesascode.tekton.dev/task: "git-clone"
 
@@ -28,8 +28,8 @@ metadata:
     pipelinesascode.tekton.dev/max-keep-runs: "5"
 spec:
   params:
-    # The variable with brackets are special to Pipelines as Code
-    # They will automatically be expanded with the events from Github.
+    # The variable with brackets are special to Pipelines-as-Code
+    # They will automatically be expanded with the events from GitHub.
     - name: repo_url
       value: "{{ repo_url }}"
     - name: revision
diff --git a/pkg/cmd/tknpac/generate/templates/go.yaml b/pkg/cmd/tknpac/generate/templates/go.yaml
@@ -4,14 +4,14 @@ kind: PipelineRun
 metadata:
   name: pipelinerun-go
   annotations:
-    # The event we are targeting as seen from the webhook payload
+    # The event we target as seen from the webhook payload
     # this can be an array too, i.e: [pull_request, push]
     pipelinesascode.tekton.dev/on-event: "pull_request"
 
-    # The branch or tag we are targeting (ie: main, refs/tags/*)
+    # The branch or tag we target (i.e., main, refs/tags/*)
     pipelinesascode.tekton.dev/on-target-branch: "main"
 
-    # Fetch the git-clone task from hub, we are able to reference later on it
+    # Fetch the git-clone task from hub, we can reference later on it
     # with taskRef and it will automatically be embedded into our pipeline.
     pipelinesascode.tekton.dev/task: "git-clone"
 
@@ -28,8 +28,8 @@ metadata:
     pipelinesascode.tekton.dev/max-keep-runs: "5"
 spec:
   params:
-    # The variable with brackets are special to Pipelines as Code
-    # They will automatically be expanded with the events from Github.
+    # The variable with brackets are special to Pipelines-as-Code
+    # They will automatically be expanded with the events from GitHub.
     - name: repo_url
       value: "{{ repo_url }}"
     - name: revision
diff --git a/pkg/cmd/tknpac/generate/templates/java.yaml b/pkg/cmd/tknpac/generate/templates/java.yaml
@@ -4,14 +4,14 @@ kind: PipelineRun
 metadata:
   name: pipelinerun-java
   annotations:
-    # The event we are targeting as seen from the webhook payload
+    # The event we target as seen from the webhook payload
     # this can be an array too, i.e: [pull_request, push]
     pipelinesascode.tekton.dev/on-event: "pull_request"
 
-    # The branch or tag we are targeting (ie: main, refs/tags/*)
+    # The branch or tag we target (i.e., main, refs/tags/*)
     pipelinesascode.tekton.dev/on-target-branch: "main"
 
-    # Fetch the git-clone task from hub, we are able to reference later on it
+    # Fetch the git-clone task from hub, we can reference later on it
     # with taskRef and it will automatically be embedded into our pipeline.
     pipelinesascode.tekton.dev/task: "git-clone"
 
@@ -28,8 +28,8 @@ metadata:
     pipelinesascode.tekton.dev/max-keep-runs: "5"
 spec:
   params:
-    # The variable with brackets are special to Pipelines as Code
-    # They will automatically be expanded with the events from Github.
+    # The variable with brackets are special to Pipelines-as-Code
+    # They will automatically be expanded with the events from GitHub.
     - name: repo_url
       value: "{{ repo_url }}"
     - name: revision
diff --git a/pkg/cmd/tknpac/generate/templates/nodejs.yaml b/pkg/cmd/tknpac/generate/templates/nodejs.yaml
@@ -4,14 +4,14 @@ kind: PipelineRun
 metadata:
   name: pipelinerun-nodejs
   annotations:
-    # The event we are targeting as seen from the webhook payload
+    # The event we target as seen from the webhook payload
     # this can be an array too, i.e: [pull_request, push]
     pipelinesascode.tekton.dev/on-event: "pull_request"
 
-    # The branch or tag we are targeting (ie: main, refs/tags/*)
+    # The branch or tag we target (i.e., main, refs/tags/*)
     pipelinesascode.tekton.dev/on-target-branch: "main"
 
-    # Fetch the git-clone task from hub, we are able to reference later on it
+    # Fetch the git-clone task from hub, we can reference later on it
     # with taskRef and it will automatically be embedded into our pipeline.
     pipelinesascode.tekton.dev/task: "git-clone"
 
@@ -27,8 +27,8 @@ metadata:
     pipelinesascode.tekton.dev/max-keep-runs: "5"
 spec:
   params:
-    # The variable with brackets are special to Pipelines as Code
-    # They will automatically be expanded with the events from Github.
+    # The variable with brackets are special to Pipelines-as-Code
+    # They will automatically be expanded with the events from GitHub.
     - name: repo_url
       value: "{{ repo_url }}"
     - name: revision
diff --git a/pkg/cmd/tknpac/generate/templates/python.yaml b/pkg/cmd/tknpac/generate/templates/python.yaml
@@ -4,14 +4,14 @@ kind: PipelineRun
 metadata:
   name: pipelinerun-python
   annotations:
-    # The event we are targeting as seen from the webhook payload
+    # The event we target as seen from the webhook payload
     # this can be an array too, i.e: [pull_request, push]
     pipelinesascode.tekton.dev/on-event: "pull_request"
 
-    # The branch or tag we are targeting (ie: main, refs/tags/*)
+    # The branch or tag we target (i.e., main, refs/tags/*)
     pipelinesascode.tekton.dev/on-target-branch: "main"
 
-    # Fetch the git-clone task from hub, we are able to reference later on it
+    # Fetch the git-clone task from hub, we can reference later on it
     # with taskRef and it will automatically be embedded into our pipeline.
     pipelinesascode.tekton.dev/task: "git-clone"
 
@@ -28,8 +28,8 @@ metadata:
     pipelinesascode.tekton.dev/max-keep-runs: "5"
 spec:
   params:
-    # The variable with brackets are special to Pipelines as Code
-    # They will automatically be expanded with the events from Github.
+    # The variable with brackets are special to Pipelines-as-Code
+    # They will automatically be expanded with the events from GitHub.
     - name: repo_url
       value: "{{ repo_url }}"
     - name: revision
diff --git a/pkg/cmd/tknpac/list/list.go b/pkg/cmd/tknpac/list/list.go
@@ -36,8 +36,8 @@ func Root(run *params.Run, ioStreams *cli.IOStreams) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:          "list",
 		Aliases:      []string{"ls"},
-		Short:        "List Pipelines as Code Repository",
-		Long:         `List Pipelines as Code Repository`,
+		Short:        "List Pipelines-as-Code repositories",
+		Long:         `List Pipelines-as-Code repositories`,
 		SilenceUsage: true,
 		Annotations: map[string]string{
 			"commandType": "main",
diff --git a/pkg/cmd/tknpac/resolve/resolve.go b/pkg/cmd/tknpac/resolve/resolve.go
diff --git a/pkg/cmd/tknpac/root.go b/pkg/cmd/tknpac/root.go
diff --git a/pkg/matcher/annotation_tasks_install.go b/pkg/matcher/annotation_tasks_install.go
diff --git a/pkg/matcher/annotation_tasks_install_test.go b/pkg/matcher/annotation_tasks_install_test.go
diff --git a/pkg/resolve/remote_test.go b/pkg/resolve/remote_test.go
diff --git a/test/gitea_test.go b/test/gitea_test.go

Original file line number	Diff line number	Diff line change
@@ -71,12 +71,12 @@ const indexTmpl = `
`71`	`71`	`
`72`	`72`
`73`	`73`	var successTmpl = fmt.Sprintf(`
`74`		`-<html><body>You have <span style=\"color: green\">successfully</span> created a new GitHub application, go back to the %s pac cli to finish the installation.</body></html>`
	`74`	`+<html><body>You have <span style=\"color: green\">successfully</span> created a new GitHub application. Return to the %s pac CLI to finish the installation.</body></html>`
`75`	`75`	`, settings.TknBinaryName)
`76`	`76`
`77`	`77`	`func install(ctx context.Context, run params.Run, opts bootstrapOpts) error {`
`78`	`78`	`if !opts.forceInstall {`
`79`		`- fmt.Fprintln(opts.ioStreams.Out, "=> Checking if Pipelines as Code is installed.")`
	`79`	`+ fmt.Fprintln(opts.ioStreams.Out, "=> Checking if Pipelines-as-Code is installed.")`
`80`	`80`	`}`
`81`	`81`	`tektonInstalled, err := checkPipelinesInstalled(run)`
`82`	`82`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ func TestInstall(t *testing.T) {`
`49`	`49`	`err := install(ctx, run, opts)`
`50`	`50`	`// get an error because i need to figure out how to fake dynamic client`
`51`	`51`	`assert.Assert(t, err != nil)`
`52`		`- assert.Equal(t, "=> Checking if Pipelines as Code is installed.\n", out.String())`
	`52`	`+ assert.Equal(t, "=> Checking if Pipelines-as-Code is installed.\n", out.String())`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`func TestDetectPacInstallation(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ func getRepoURL(opts *RepoOptions) error {`
`216`	`216`	`return nil`
`217`	`217`	`}`
`218`	`218`
`219`		`- q := "Enter the Git repository url "`
	`219`	`+ q := "Enter the Git repository URL "`
`220`	`220`	`var err error`
`221`	`221`	`if opts.GitInfo.URL != "" {`
`222`	`222`	`opts.GitInfo.URL, err = cleanupGitURL(opts.GitInfo.URL)`