Update to only use auto-generate if no env / -c commit hash is found

debricked · Nov 21, 2024 · ab210af · ab210af
1 parent 636856c
commit ab210af
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/internal/cmd/scan/scan.go b/internal/cmd/scan/scan.go
@@ -90,7 +90,7 @@ If the given path contains a git repository all flags but "integration" will be
 
 	cmd.Flags().StringVarP(&repositoryName, RepositoryFlag, "r", "", "repository name")
 	cmd.Flags().StringVarP(&commitName, CommitFlag, "c", "", "commit hash")
-	cmd.Flags().BoolVar(&generateCommitNameBool, GenerateCommitName, false, "auto-generate a commit name if flag is set")
+	cmd.Flags().BoolVar(&generateCommitNameBool, GenerateCommitName, false, "auto-generate a commit name if no commit hash is found (in -c or env)")
 	cmd.Flags().StringVarP(&branchName, BranchFlag, "b", "", "branch name")
 	cmd.Flags().StringVarP(&commitAuthor, CommitAuthorFlag, "a", "", "commit author")
 	cmd.Flags().StringVarP(&repositoryUrl, RepositoryUrlFlag, "u", "", "repository URL")

diff --git a/internal/scan/scanner.go b/internal/scan/scanner.go
@@ -105,14 +105,14 @@ func (dScanner *DebrickedScanner) Scan(o IOptions) error {
 
 	e, _ := dScanner.ciService.Find()
 
-	if dOptions.GenerateCommitName {
-		debug.Log("Overwriting commit name with generated name", dOptions.Debug)
-		dOptions.CommitName = GenerateCommitNameTimestamp()
-	}
-
 	debug.Log("Mapping environment variables...", dOptions.Debug)
 	MapEnvToOptions(&dOptions, e)
 
+	if dOptions.GenerateCommitName && dOptions.CommitName == "" {
+		debug.Log("No commit name set, generating commit name", dOptions.Debug)
+		dOptions.CommitName = GenerateCommitNameTimestamp()
+	}
+
 	if err := SetWorkingDirectory(&dOptions); err != nil {
 		return err
 	}