diff options
| author | Pavlo Strokov <pstrokov@gitlab.com> | 2020-09-25 13:17:31 +0300 |
|---|---|---|
| committer | Pavlo Strokov <pstrokov@gitlab.com> | 2020-09-25 13:17:31 +0300 |
| commit | ca209ee3573edcb23aeccec9d5c1751646af5b97 (patch) | |
| tree | 0bdeec4bba9ceb2ed6ed13f4bdfc61eebcc41492 | |
| parent | 7d0252b8406dfccde40375887279dbd9fb665d5a (diff) | |
| parent | c557296bbe92be7de4ea784f9b1f6580dbc59d4e (diff) | |
Merge branch 'pks-catfile-formatting' into 'master'
catfile: Fix formatting for the objectinfo fuzzer
See merge request gitlab-org/gitaly!2597
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | internal/git/catfile/objectinfo_fuzz.go | 3 |
2 files changed, 3 insertions, 3 deletions
@@ -248,7 +248,8 @@ lint: ${GOLANGCI_LINT} libgit2 ${Q}${GOLANGCI_LINT} cache clean && ${GOLANGCI_LINT} run --build-tags "${GO_BUILD_TAGS}" --out-format tab --config ${SOURCE_DIR}/.golangci.yml .PHONY: check-formatting -check-formatting: ${GITALYFMT} +check-formatting: ${GOIMPORTS} ${GITALYFMT} + ${Q}${GOIMPORTS} -l $(call find_go_sources) | awk '{ print } END { if(NR>0) { print "goimports error, run make format"; exit(1) } }' ${Q}${GITALYFMT} $(call find_go_sources) | awk '{ print } END { if(NR>0) { print "Formatting error, run make format"; exit(1) } }' .PHONY: format diff --git a/internal/git/catfile/objectinfo_fuzz.go b/internal/git/catfile/objectinfo_fuzz.go index ab3cdaddf..a6507cdb8 100644 --- a/internal/git/catfile/objectinfo_fuzz.go +++ b/internal/git/catfile/objectinfo_fuzz.go @@ -7,9 +7,8 @@ import ( "bytes" ) -func Fuzz(data [] byte) int { +func Fuzz(data []byte) int { reader := bufio.NewReader(bytes.NewReader(data)) ParseObjectInfo(reader) return 0 } - |