From 82e6674099a33359279a96953ac614d6671493a2 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Mon, 8 Feb 2021 12:49:51 -0800
Subject: [PATCH] fix: go doesn't allow gnu short flags

---
 assets/assets.go | 4 ++--
 bin/test-go-fmt  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/assets/assets.go b/assets/assets.go
index d203089f8..e8893c635 100644
--- a/assets/assets.go
+++ b/assets/assets.go
@@ -1,8 +1,8 @@
 //go:generate git submodule update --init ./dir-index-html
 //go:generate go run github.com/go-bindata/go-bindata/v3/go-bindata -mode=0644 -modtime=1403768328 -pkg=assets init-doc dir-index-html/dir-index.html dir-index-html/knownIcons.txt
-//go:generate gofmt -sw bindata.go
+//go:generate gofmt -s -w bindata.go
 //go:generate sh -c "sed -i \"s/.*BindataVersionHash.*/BindataVersionHash=\\\"$(git hash-object bindata.go)\\\"/\" bindata_version_hash.go"
-//go:generate gofmt -sw bindata_version_hash.go
+//go:generate gofmt -s -w bindata_version_hash.go
 package assets
 
 import (
diff --git a/bin/test-go-fmt b/bin/test-go-fmt
index 8bd1f07bf..3f69d8389 100755
--- a/bin/test-go-fmt
+++ b/bin/test-go-fmt
@@ -4,7 +4,7 @@ T="$(mktemp)"
 find . \
     -path ./test/sharness -prune \
  -o -path ./plugin/loader/preload.go -prune \
- -o -name '*.go' -print0 | xargs -0 gofmt -sl > "$T"
+ -o -name '*.go' -print0 | xargs -0 gofmt -s -l > "$T"
 
 if [ -n "$(cat $T)" ]; then
 	echo "Following Go code is not formatted."
-- 
GitLab