Skip to content

Add a git grep search timeout #36809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lunny merged 5 commits into from
Mar 4, 2026
+6 −0
Merged

Add a git grep search timeout #36809

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ccaedea
Add a git grep search timeout
lunny Mar 2, 2026
0090a2b
use const
lunny Mar 3, 2026
8ffd17c
Merge branch 'main' into lunny/add_git_grep_timeout
lunny Mar 3, 2026
3204898
Merge branch 'main' into lunny/add_git_grep_timeout
lunny Mar 4, 2026
2228919
Merge branch 'main' into lunny/add_git_grep_timeout
lunny Mar 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions modules/git/grep.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"slices"
"strconv"
"strings"
"time"

"code.gitea.io/gitea/modules/git/gitcmd"
"code.gitea.io/gitea/modules/util"
Expand Down Expand Up @@ -39,6 +40,10 @@ type GrepOptions struct {
PathspecList []string
}

// grepSearchTimeout is the timeout for git grep search, it should be long enough to get results
// but not too long to cause performance issues
const grepSearchTimeout = 30 * time.Second

func GrepSearch(ctx context.Context, repo *Repository, search string, opts GrepOptions) ([]*GrepResult, error) {
/*
The output is like this ( "^@" means \x00):
Expand Down Expand Up @@ -76,6 +81,7 @@ func GrepSearch(ctx context.Context, repo *Repository, search string, opts GrepO
stdoutReader, stdoutReaderClose := cmd.MakeStdoutPipe()
defer stdoutReaderClose()
err := cmd.WithDir(repo.Path).
WithTimeout(grepSearchTimeout).
WithPipelineFunc(func(ctx gitcmd.Context) error {
isInBlock := false
rd := bufio.NewReaderSize(stdoutReader, util.IfZero(opts.MaxLineLength, 16*1024))
Expand Down
Loading