improve code quality (go-gitea#21462) (go-gitea#21463)

Backport go-gitea#21462

modules/git/commit.go

@@ -250,15 +250,15 @@ func NewSearchCommitsOptions(searchString string, forAllRefs bool) SearchCommits
 	for _, k := range fields {
 		switch {
 		case strings.HasPrefix(k, "author:"):
-			authors = append(authors, strings.TrimPrefix(k, "author:"))
+			authors = append(authors, strings.ReplaceAll(strings.TrimSpace(strings.TrimPrefix(k, "author:")), "'", ""))
 		case strings.HasPrefix(k, "committer:"):
-			committers = append(committers, strings.TrimPrefix(k, "committer:"))
+			committers = append(committers, strings.ReplaceAll(strings.TrimSpace(strings.TrimPrefix(k, "committer:")), "'", ""))
 		case strings.HasPrefix(k, "after:"):
-			after = strings.TrimPrefix(k, "after:")
+			after = strings.ReplaceAll(strings.TrimSpace(strings.TrimPrefix(k, "after:")), "'", "")
 		case strings.HasPrefix(k, "before:"):
-			before = strings.TrimPrefix(k, "before:")
+			before = strings.ReplaceAll(strings.TrimSpace(strings.TrimPrefix(k, "before:")), "'", "")
 		default:
-			keywords = append(keywords, k)
+			keywords = append(keywords, strings.ReplaceAll(strings.TrimSpace(k), "'", ""))
 		}
 	}
 

modules/git/repo_commit.go

@@ -158,7 +158,7 @@ func (repo *Repository) searchCommits(id SHA1, opts SearchCommitsOptions) ([]*Co
 				// add previous arguments except for --grep and --all
 				hashCmd.AddArguments(args...)
 				// add keyword as <commit>
-				hashCmd.AddArguments(v)
+				hashCmd.AddArguments("--end-of-options", v)
 
 				// search with given constraints for commit matching sha hash of v
 				hashMatching, _, err := hashCmd.RunStdBytes(&RunOpts{Dir: repo.Path})
@@ -208,9 +208,10 @@ func (repo *Repository) CommitsByFileAndRange(revision, file string, page int) (
 	}()
 	go func() {
 		stderr := strings.Builder{}
-		err := NewCommand(repo.Ctx, "log", revision, "--follow",
+		err := NewCommand(repo.Ctx, "log", prettyLogFormat, "--follow",
 			"--max-count="+strconv.Itoa(setting.Git.CommitsRangeSize*page),
-			prettyLogFormat, "--", file).
+			"--end-of-options", revision,
+			"--", file).
 			Run(&RunOpts{
 				Dir:    repo.Path,
 				Stdout: stdoutWriter,

modules/git/repo_stats.go

@@ -63,7 +63,7 @@ func (repo *Repository) GetCodeActivityStats(fromTime time.Time, branch string)
 	if len(branch) == 0 {
 		args = append(args, "--branches=*")
 	} else {
-		args = append(args, "--first-parent", branch)
+		args = append(args, "--first-parent", "--", branch)
 	}
 
 	stderr := new(strings.Builder)