Commit d29f4018 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch '24008-use-git-grep-for-lint-conflicts' into 'master'

Use git grep to search for conflict headers

Closes #24008

See merge request gitlab-org/gitlab!20937
parents 0f090718 fbd3a476
#!/bin/sh #!/bin/sh
output=`git ls-files -z | grep -zvE '\.(rb|js|haml)$' | xargs -0n1 grep -HEn '^<<<<<<< '` output=`git grep -En '^<<<<<<< ' -- . ':(exclude)spec/lib/gitlab/conflict/file_spec.rb' ':(exclude)spec/lib/gitlab/git/conflict/parser_spec.rb'`
echo $output echo $output
test -z "$output" test -z "$output"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment