Skip to content

Commit 9799b3a

Browse files
committed
Git config user.name and user.email locally
Git config --user.name and git config --user.email, otherwise, git commit would fail. Signed-off-by: JenTing Hsiao <[email protected]>
1 parent cd947b1 commit 9799b3a

File tree

2 files changed

+50
-0
lines changed

2 files changed

+50
-0
lines changed

test/pkg/integration/common/git-client.go

+34
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,40 @@ func (g GitClient) Add(dir string, files ...string) error {
5959
return nil
6060
}
6161

62+
func (g GitClient) ConfigUserName(dir string) error {
63+
args := []string{"config", "--local", "user.name", "integration-test"}
64+
var resp agent.ExecResponse
65+
err := g.Call("WorkspaceAgent.Exec", &agent.ExecRequest{
66+
Dir: dir,
67+
Command: "git",
68+
Args: args,
69+
}, &resp)
70+
if err != nil {
71+
return err
72+
}
73+
if resp.ExitCode != 0 {
74+
return xerrors.Errorf("config user name returned rc: %d", resp.ExitCode)
75+
}
76+
return nil
77+
}
78+
79+
func (g GitClient) ConfigUserEmail(dir string, files ...string) error {
80+
args := []string{"config", "--local", "user.email", "[email protected]"}
81+
var resp agent.ExecResponse
82+
err := g.Call("WorkspaceAgent.Exec", &agent.ExecRequest{
83+
Dir: dir,
84+
Command: "git",
85+
Args: args,
86+
}, &resp)
87+
if err != nil {
88+
return err
89+
}
90+
if resp.ExitCode != 0 {
91+
return xerrors.Errorf("config user email returned rc: %d", resp.ExitCode)
92+
}
93+
return nil
94+
}
95+
6296
func (g GitClient) Commit(dir string, message string, all bool) error {
6397
args := []string{"commit", "-m", message}
6498
if all {

test/tests/workspace/git_test.go

+16
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,14 @@ func TestGitActions(t *testing.T) {
5050
if err != nil {
5151
return err
5252
}
53+
err = git.ConfigUserName(workspaceRoot)
54+
if err != nil {
55+
return err
56+
}
57+
err = git.ConfigUserEmail(workspaceRoot)
58+
if err != nil {
59+
return err
60+
}
5361
err = git.Add(workspaceRoot)
5462
if err != nil {
5563
return err
@@ -80,6 +88,14 @@ func TestGitActions(t *testing.T) {
8088
if err != nil {
8189
return err
8290
}
91+
err = git.ConfigUserName(workspaceRoot)
92+
if err != nil {
93+
return err
94+
}
95+
err = git.ConfigUserEmail(workspaceRoot)
96+
if err != nil {
97+
return err
98+
}
8399
err = git.Add(workspaceRoot)
84100
if err != nil {
85101
return err

0 commit comments

Comments
 (0)