Skip to content
This repository has been archived by the owner on Jul 29, 2024. It is now read-only.

Configure author from GitLab current user #100

Merged
merged 1 commit into from
Oct 14, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions pkg/in/command.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,17 @@ func (command *Command) Run(destination string, request Request) (Response, erro
return Response{}, err
}

user, _, err := command.client.Users.CurrentUser()
err = command.runner.Run("config", "--global", "user.email", user.Email)
if err != nil {
return Response{}, err
}

err = command.runner.Run("config", "--global", "user.name", user.Name)
if err != nil {
return Response{}, err
}

mr, _, err := command.client.MergeRequests.GetMergeRequest(request.Source.GetProjectPath(), request.Version.ID, &gitlab.GetMergeRequestsOptions{})
if err != nil {
return Response{}, err
Expand Down Expand Up @@ -61,9 +72,17 @@ func (command *Command) Run(destination string, request Request) (Response, erro

os.Chdir(destination)

command.runner.Run("remote", "add", "source", source.String())
command.runner.Run("remote", "update")
command.runner.Run("merge", "--no-ff", "--no-commit", mr.SHA)
err = command.runner.Run("remote", "add", "source", source.String())
if err != nil {
return Response{}, err
}

err = command.runner.Run("remote", "update")
if err != nil {
return Response{}, err
}

err = command.runner.Run("merge", "--no-ff", "--no-commit", mr.SHA)
if err != nil {
return Response{}, err
}
Expand Down