diff options
| author | Xiang Dai <long0dai@foxmail.com> | 2020-06-16 16:55:53 +0800 |
|---|---|---|
| committer | Xiang Dai <long0dai@foxmail.com> | 2020-06-17 08:38:20 +0800 |
| commit | 2c7a1bedea7846db05acd41cab521e7b1cf77788 (patch) | |
| tree | 4b3ad0ad98fa270a54c06c95bb292c382be0c322 /hack/lib/lint.sh | |
| parent | Merge pull request #1813 from kevin-wangzefeng/update-maintainers (diff) | |
| download | kubeedge-2c7a1bedea7846db05acd41cab521e7b1cf77788.tar.gz | |
hack/lib/lint.sh: fix merge error
Signed-off-by: Xiang Dai <long0dai@foxmail.com>
Diffstat (limited to 'hack/lib/lint.sh')
| -rw-r--r-- | hack/lib/lint.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/hack/lib/lint.sh b/hack/lib/lint.sh index 96cdb403e..9469eed34 100644 --- a/hack/lib/lint.sh +++ b/hack/lib/lint.sh @@ -23,6 +23,7 @@ set -o pipefail kubeedge::lint::check() { cd ${KUBEEDGE_ROOT} # skip deleted files + set +o pipefail git diff --cached --name-only --diff-filter=ACRMTU master | grep -Ev "externalversions|fake|vendor" | xargs --no-run-if-empty sed -i 's/[ \t]*$//' [[ $(git diff --name-only) ]] && { @@ -31,4 +32,5 @@ kubeedge::lint::check() { } golangci-lint run gofmt -l -w staging + set -o pipefail } |