mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-22 15:23:14 -05:00
Merge pull request 'git-grep: skip binary files' (#4927) from yoctozepto/forgejo:git-grep-skip-binary into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4927 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Reviewed-by: Shiny Nematoda <snematoda@noreply.codeberg.org>
This commit is contained in:
commit
d2184dd931
2 changed files with 27 additions and 1 deletions
|
@ -63,8 +63,9 @@ func GrepSearch(ctx context.Context, repo *Repository, search string, opts GrepO
|
||||||
2^@10^@repo: go-gitea/gitea
|
2^@10^@repo: go-gitea/gitea
|
||||||
*/
|
*/
|
||||||
var results []*GrepResult
|
var results []*GrepResult
|
||||||
|
// -I skips binary files
|
||||||
cmd := NewCommand(ctx, "grep",
|
cmd := NewCommand(ctx, "grep",
|
||||||
"--null", "--break", "--heading", "--column",
|
"-I", "--null", "--break", "--heading", "--column",
|
||||||
"--fixed-strings", "--line-number", "--ignore-case", "--full-name")
|
"--fixed-strings", "--line-number", "--ignore-case", "--full-name")
|
||||||
cmd.AddOptionValues("--context", fmt.Sprint(opts.ContextLineNumber))
|
cmd.AddOptionValues("--context", fmt.Sprint(opts.ContextLineNumber))
|
||||||
if opts.MatchesPerFile > 0 {
|
if opts.MatchesPerFile > 0 {
|
||||||
|
|
|
@ -98,6 +98,31 @@ func TestGrepSearch(t *testing.T) {
|
||||||
assert.Empty(t, res)
|
assert.Empty(t, res)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestGrepNoBinary(t *testing.T) {
|
||||||
|
tmpDir := t.TempDir()
|
||||||
|
|
||||||
|
err := InitRepository(DefaultContext, tmpDir, false, Sha1ObjectFormat.Name())
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
gitRepo, err := openRepositoryWithDefaultContext(tmpDir)
|
||||||
|
require.NoError(t, err)
|
||||||
|
defer gitRepo.Close()
|
||||||
|
|
||||||
|
require.NoError(t, os.WriteFile(path.Join(tmpDir, "BINARY"), []byte("I AM BINARY\n\x00\nYOU WON'T SEE ME"), 0o666))
|
||||||
|
require.NoError(t, os.WriteFile(path.Join(tmpDir, "TEXT"), []byte("I AM NOT BINARY\nYOU WILL SEE ME"), 0o666))
|
||||||
|
|
||||||
|
err = AddChanges(tmpDir, true)
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
err = CommitChanges(tmpDir, CommitChangesOptions{Message: "Binary and text files"})
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
res, err := GrepSearch(context.Background(), gitRepo, "BINARY", GrepOptions{})
|
||||||
|
require.NoError(t, err)
|
||||||
|
assert.Len(t, res, 1)
|
||||||
|
assert.Equal(t, "TEXT", res[0].Filename)
|
||||||
|
}
|
||||||
|
|
||||||
func TestGrepLongFiles(t *testing.T) {
|
func TestGrepLongFiles(t *testing.T) {
|
||||||
tmpDir := t.TempDir()
|
tmpDir := t.TempDir()
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue