Administrator/gitea-MIRROR
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-11-09 17:37:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

refactor: use RunWithStderr for git commands (#40295)

Browse Source 
If the stderr output is not handled, then it needs to use RunWithStderr
to make sure the git error message is included in the returned error.
Otherwise, when the git command fails, the error log won't show useful
information.

Ref:

* #39795 : no useful information in log messages
*
https://github.com/go-gitea/gitea/pull/40160#pullrequestreview-5752720866
This commit is contained in:
wxiaoguang
2026-11-09 17:59:52 +00:00
committed by GitHub
parent e0b2f3425e
commit 772f365254
26 changed files with 57 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/integration/git_misc_test.go
View File

@@ -113,7 +113,7 @@ func TestAgitPullPush(t *testing.T) {
assert.NoError(t, err)
// create PR via agit
err = gitcmd.NewCommand(testCase.pushArgs...).WithDir(dstPath).Run(t.Context())
err = gitcmd.NewCommand(testCase.pushArgs...).WithDir(dstPath).RunWithStderr(t.Context())
assert.NoError(t, err)
// check pull request exist
@@ -132,14 +132,14 @@ func TestAgitPullPush(t *testing.T) {
// push 2
err = gitcmd.NewCommand("push", "origin", "HEAD:refs/for/master/test-agit-push").
WithDir(dstPath).
Run(t.Context())
RunWithStderr(t.Context())
assert.NoError(t, err)
pr = unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: 1, Flow: issues_model.PullRequestFlowAGit, HeadBranch: "user2/test-agit-push"})
assert.Equal(t, 0, pr.CommitsBehind)
assert.Equal(t, 2, pr.CommitsAhead)
// reset to first commit
err = gitcmd.NewCommand("reset", "--hard", "HEAD~1").WithDir(dstPath).Run(t.Context())
err = gitcmd.NewCommand("reset", "--hard", "HEAD~1").WithDir(dstPath).RunWithStderr(t.Context())
assert.NoError(t, err)
// test force push without confirm
@@ -153,7 +153,7 @@ func TestAgitPullPush(t *testing.T) {
// test force push with confirm
err = gitcmd.NewCommand("push", "origin", "HEAD:refs/for/master/test-agit-push", "-o", "force-push").
WithDir(dstPath).
Run(t.Context())
RunWithStderr(t.Context())
assert.NoError(t, err)
_, stderr, _ = gitcmd.NewCommand("push", "origin", "HEAD:refs/for/no-such-branch/test-agit-push").
@@ -193,7 +193,7 @@ func TestAgitPullPush(t *testing.T) {
err = gitcmd.NewCommand("push", "origin", "HEAD:refs/for/master/test-agit-review").
WithDir(dstPath).
Run(t.Context())
RunWithStderr(t.Context())
assert.NoError(t, err)
// Reload PR to get updated commit ID