tyler.durden
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not include global arguments in process manager (#19226) 

The git command by default adds a number of global arguments. These are not
helpful to be displayed in the process manager and so should be skipped for
default process descriptions.

Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
zeripath 2022-03-27 10:09:56 +01:00 committed by GitHub
parent 793ce9dacf
commit 41b60d94db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/git/command.go
View File

@ -36,6 +36,7 @@ type Command struct {
args []string args []string
parentContext context.Context parentContext context.Context
desc string desc string
globalArgsLength int
} }
func (c *Command) String() string { func (c *Command) String() string {
@ -54,6 +55,7 @@ func NewCommand(ctx context.Context, args ...string) *Command {
name: GitExecutable, name: GitExecutable,
args: append(cargs, args...), args: append(cargs, args...),
parentContext: ctx, parentContext: ctx,
globalArgsLength: len(globalCommandArgs),
} }
} }
@ -140,7 +142,7 @@ func (c *Command) RunWithContext(rc *RunContext) error {
desc := c.desc desc := c.desc
if desc == "" { if desc == "" {
desc = fmt.Sprintf("%s %s [repo_path: %s]", c.name, strings.Join(c.args, " "), rc.Dir) desc = fmt.Sprintf("%s %s [repo_path: %s]", c.name, strings.Join(c.args[c.globalArgsLength:], " "), rc.Dir)
} }
ctx, cancel, finished := process.GetManager().AddContextTimeout(c.parentContext, rc.Timeout, desc) ctx, cancel, finished := process.GetManager().AddContextTimeout(c.parentContext, rc.Timeout, desc)