finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

replace IfZero with cmp.Or

Browse source
This commit is contained in:
Shiny Nematoda 2024-03-28 11:58:26 +00:00
parent a38260aed9
commit db7e6948a1
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/git/grep.go
View file

@ -6,14 +6,13 @@ package git
import ( import (
"bufio" "bufio"
"bytes" "bytes"
"cmp"
"context" "context"
"errors" "errors"
"fmt" "fmt"
"os" "os"
"strconv" "strconv"
"strings" "strings"
"code.gitea.io/gitea/modules/util"
) )
type GrepResult struct { type GrepResult struct {
@ -59,8 +58,8 @@ func GrepSearch(ctx context.Context, repo *Repository, search string, opts GrepO
} else { } else {
cmd.AddOptionValues("-e", strings.TrimLeft(search, "-")) cmd.AddOptionValues("-e", strings.TrimLeft(search, "-"))
} }
cmd.AddDynamicArguments(util.IfZero(opts.RefName, "HEAD")) cmd.AddDynamicArguments(cmp.Or(opts.RefName, "HEAD"))
opts.MaxResultLimit = util.IfZero(opts.MaxResultLimit, 50) opts.MaxResultLimit = cmp.Or(opts.MaxResultLimit, 50)
stderr := bytes.Buffer{} stderr := bytes.Buffer{}
err = cmd.Run(&RunOpts{ err = cmd.Run(&RunOpts{
Dir: repo.Path, Dir: repo.Path,