fix tests/integration/recipe_new.bats
All checks were successful
continuous-integration/drone/pr Build is passing

This commit is contained in:
2024-02-23 12:34:59 +01:00
parent b6b0808066
commit 0aac464ded
4 changed files with 31 additions and 9 deletions

View File

@ -2,13 +2,13 @@ package git
import (
"github.com/go-git/go-git/v5"
gitPkg "github.com/go-git/go-git/v5"
"github.com/go-git/go-git/v5/plumbing/object"
"github.com/sirupsen/logrus"
)
// Init inits a new repo and commits all the stuff if you want
func Init(repoPath string, commit bool) error {
if _, err := gitPkg.PlainInit(repoPath, false); err != nil {
func Init(repoPath string, commit bool, gitUser, gitEmail string) error {
if _, err := git.PlainInit(repoPath, false); err != nil {
logrus.Fatal(err)
}
logrus.Debugf("initialised new git repo in %s", repoPath)
@ -28,7 +28,12 @@ func Init(repoPath string, commit bool) error {
return err
}
if _, err = commitWorktree.Commit("init", &git.CommitOptions{}); err != nil {
var author *object.Signature
if gitUser != "" && gitEmail != "" {
author = &object.Signature{Name: gitUser, Email: gitEmail}
}
if _, err = commitWorktree.Commit("init", &git.CommitOptions{Author: author}); err != nil {
return err
}
logrus.Debugf("init committed all files for new git repo in %s", repoPath)