diff options
| author | 2026-06-07 08:57:29 +0000 | |
|---|---|---|
| committer | 2026-06-07 08:57:29 +0000 | |
| commit | f0b42f343247aea940e5b465ca2221a731f617f5 (patch) | |
| tree | 2a592767d0bf96b784cb0b957cfa1ecd63980fa5 /internal/testgit | |
| parent | object/commit: noinlineerr (diff) | |
| signature | No signature | |
internal/testgit: Fix lints too
Diffstat (limited to 'internal/testgit')
| -rw-r--r-- | internal/testgit/command.go | 2 | ||||
| -rw-r--r-- | internal/testgit/commit.go | 9 | ||||
| -rw-r--r-- | internal/testgit/fsck.go | 4 |
3 files changed, 13 insertions, 2 deletions
diff --git a/internal/testgit/command.go b/internal/testgit/command.go index dc960877..27fbd321 100644 --- a/internal/testgit/command.go +++ b/internal/testgit/command.go @@ -39,9 +39,11 @@ func (repo *Repo) Run( func setEnv(env []string, key string, value string) []string { prefix := key + "=" + i := slices.IndexFunc(env, func(entry string) bool { return strings.HasPrefix(entry, prefix) }) + if i >= 0 { env[i] = prefix + value diff --git a/internal/testgit/commit.go b/internal/testgit/commit.go index b33b8904..a608d2fa 100644 --- a/internal/testgit/commit.go +++ b/internal/testgit/commit.go @@ -34,7 +34,9 @@ func (repo *Repo) CommitTree( ) (id.ObjectID, error) { tb.Helper() - args := []string{"commit-tree"} + args := make([]string, 0, 1+2*len(parents)+4) + args = append(args, "commit-tree") + for _, parent := range parents { args = append(args, "-p", parent.String()) } @@ -45,18 +47,23 @@ func (repo *Repo) CommitTree( if opts.Author.Name != "" { cmd.Env = setEnv(cmd.Env, "GIT_AUTHOR_NAME", opts.Author.Name) } + if opts.Author.Email != "" { cmd.Env = setEnv(cmd.Env, "GIT_AUTHOR_EMAIL", opts.Author.Email) } + if opts.AuthorDate != "" { cmd.Env = setEnv(cmd.Env, "GIT_AUTHOR_DATE", opts.AuthorDate) } + if opts.Committer.Name != "" { cmd.Env = setEnv(cmd.Env, "GIT_COMMITTER_NAME", opts.Committer.Name) } + if opts.Committer.Email != "" { cmd.Env = setEnv(cmd.Env, "GIT_COMMITTER_EMAIL", opts.Committer.Email) } + if opts.CommitterDate != "" { cmd.Env = setEnv(cmd.Env, "GIT_COMMITTER_DATE", opts.CommitterDate) } diff --git a/internal/testgit/fsck.go b/internal/testgit/fsck.go index a500ee9f..a1c48026 100644 --- a/internal/testgit/fsck.go +++ b/internal/testgit/fsck.go @@ -21,6 +21,7 @@ func (repo *Repo) Fsck(tb testing.TB, opts FsckOptions, objects ...id.ObjectID) if opts.Strict { args = append(args, "--strict") } + if opts.NoDangling { args = append(args, "--no-dangling") } @@ -31,7 +32,8 @@ func (repo *Repo) Fsck(tb testing.TB, opts FsckOptions, objects ...id.ObjectID) args = append(args, object.String()) } - if _, err := repo.Run(tb, nil, "git", args...); err != nil { + _, err := repo.Run(tb, nil, "git", args...) + if err != nil { return fmt.Errorf("fsck: %w", err) } |
