diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-02-26 15:31:22 -0800 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-02-26 15:31:22 -0800 |
| commit | 1fd13a7fe3bab21df9cccfebfbd9e6389a67fdda (patch) | |
| tree | ea213580b076c340220d884b3fa67a8ba09a8e0c | |
| parent | 3ae5e475293b4143ed6af530da0d2ab8d9fba56a (diff) | |
| download | gitlab-ce-rs-fix-lint-conflicts.tar.gz | |
Make lint-conflicts platform-agnosticrs-fix-lint-conflicts
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51124
| -rwxr-xr-x | scripts/lint-conflicts.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lint-conflicts.sh b/scripts/lint-conflicts.sh index f3877600c8c..630fb94d2d2 100755 --- a/scripts/lint-conflicts.sh +++ b/scripts/lint-conflicts.sh @@ -1,5 +1,5 @@ #!/bin/sh -output=`git ls-files -z | grep -zvE '\.(rb|js|haml)$' | xargs -0n1 grep -HEn '^<<<<<<< '` -echo $output +output=$(git grep -E '^<<<<<<< HEAD' -- '*.haml' '*.js' '*.rb') +echo "$output" test -z "$output" |