improve AddOptionFormat to avoid low-level mistakes

Author: wxiaoguang

modules/git/command.go

@@ -142,7 +142,11 @@ func (c *Command) AddOptionFormat(opt string, args ...any) *Command {
 		c.brokenArgs = append(c.brokenArgs, opt)
 		return c
 	}
-
+	// a quick check to make sure the format string matches the number of arguments, to find low-level mistakes ASAP
+	if strings.Count(strings.ReplaceAll(opt, "%%", ""), "%") != len(args) {
+		c.brokenArgs = append(c.brokenArgs, opt)
+		return c
+	}
 	s := fmt.Sprintf(opt, args...)
 	c.args = append(c.args, s)
 	return c

modules/git/repo_archive.go

@@ -59,7 +59,7 @@ func (repo *Repository) CreateArchive(ctx context.Context, format ArchiveType, t
 	if usePrefix {
 		cmd.AddOptionFormat("--prefix=%s", filepath.Base(strings.TrimSuffix(repo.Path, ".git"))+"/")
 	}
-	cmd.AddOptionFormat("--format=%s" + format.String())
+	cmd.AddOptionFormat("--format=%s", format.String())
 	cmd.AddDynamicArguments(commitID)
 
 	var stderr strings.Builder

modules/git/repo_commit.go

@@ -123,7 +123,7 @@ func (repo *Repository) searchCommits(id SHA1, opts SearchCommitsOptions) ([]*Co
 			c.AddOptionFormat("--after=%s", opts.After)
 		}
 		if len(opts.Before) > 0 {
-			c.AddOptionFormat("--before=%s" + opts.Before)
+			c.AddOptionFormat("--before=%s", opts.Before)
 		}
 	}