loading up the forgejo repo on tangled to test page performance
Merge pull request 'Replace IfZero with cmp.Or' (#2854) from snematoda/revert-ifzero into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2854
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
+3
-13
+3
-4
modules/git/grep.go
+3
-4
modules/git/grep.go
···
6
6
import (
7
7
"bufio"
8
8
"bytes"
9
+
"cmp"
9
10
"context"
10
11
"errors"
11
12
"fmt"
12
13
"os"
13
14
"strconv"
14
15
"strings"
15
-
16
-
"code.gitea.io/gitea/modules/util"
17
16
)
18
17
19
18
type GrepResult struct {
···
59
58
} else {
60
59
cmd.AddOptionValues("-e", strings.TrimLeft(search, "-"))
61
60
}
62
-
cmd.AddDynamicArguments(util.IfZero(opts.RefName, "HEAD"))
63
-
opts.MaxResultLimit = util.IfZero(opts.MaxResultLimit, 50)
61
+
cmd.AddDynamicArguments(cmp.Or(opts.RefName, "HEAD"))
62
+
opts.MaxResultLimit = cmp.Or(opts.MaxResultLimit, 50)
64
63
stderr := bytes.Buffer{}
65
64
err = cmd.Run(&RunOpts{
66
65
Dir: repo.Path,
-9
modules/util/util.go
-9
modules/util/util.go