github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 18:54:06 +00:00
Code Issues Projects Releases Wiki Activity

gofmt -s && change gofmt reminder to specify -s in prepare-commit-msg

Browse Source
This commit is contained in:
Daniel Smith 2014-06-12 17:25:46 -07:00
parent 867daadbdb
commit 078451053b
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hooks/prepare-commit-msg
View File

@ -10,7 +10,7 @@ for file in $(git diff --cached --name-only | grep "\.go"); do
done done
if [[ $errors == "1" ]]; then if [[ $errors == "1" ]]; then
echo "# To fix these errors, run gofmt -w <file>." >> $1 echo "# To fix these errors, run gofmt -s -w <file>." >> $1
echo "# If you want to commit in spite of these format errors," >> $1 echo "# If you want to commit in spite of these format errors," >> $1
echo "# then delete this line. Otherwise, your commit will be" >> $1 echo "# then delete this line. Otherwise, your commit will be" >> $1
echo "# aborted." >> $1 echo "# aborted." >> $1

14
pkg/kubelet/kubelet_test.go
View File

@ -594,11 +594,11 @@ func TestMakeCommandLine(t *testing.T) {
func TestMakeEnvVariables(t *testing.T) { func TestMakeEnvVariables(t *testing.T) {
container := api.Container{ container := api.Container{
Env: []api.EnvVar{ Env: []api.EnvVar{
api.EnvVar{ {
Name: "foo", Name: "foo",
Value: "bar", Value: "bar",
}, },
api.EnvVar{ {
Name: "baz", Name: "baz",
Value: "blah", Value: "blah",
}, },
@ -619,12 +619,12 @@ func TestMakeEnvVariables(t *testing.T) {
func TestMakeVolumesAndBinds(t *testing.T) { func TestMakeVolumesAndBinds(t *testing.T) {
container := api.Container{ container := api.Container{
VolumeMounts: []api.VolumeMount{ VolumeMounts: []api.VolumeMount{
api.VolumeMount{ {
MountPath: "/mnt/path", MountPath: "/mnt/path",
Name: "disk", Name: "disk",
ReadOnly: false, ReadOnly: false,
}, },
api.VolumeMount{ {
MountPath: "/mnt/path2", MountPath: "/mnt/path2",
Name: "disk2", Name: "disk2",
ReadOnly: true, ReadOnly: true,
@ -653,11 +653,11 @@ func TestMakeVolumesAndBinds(t *testing.T) {
func TestMakePortsAndBindings(t *testing.T) { func TestMakePortsAndBindings(t *testing.T) {
container := api.Container{ container := api.Container{
Ports: []api.Port{ Ports: []api.Port{
api.Port{ {
ContainerPort: 80, ContainerPort: 80,
HostPort: 8080, HostPort: 8080,
}, },
api.Port{ {
ContainerPort: 443, ContainerPort: 443,
HostPort: 443, HostPort: 443,
}, },
@ -840,7 +840,7 @@ func TestWatchEtcd(t *testing.T) {
reader := startReading(changeChannel) reader := startReading(changeChannel)
manifest := []api.ContainerManifest{ manifest := []api.ContainerManifest{
api.ContainerManifest{ {
Id: "foo", Id: "foo",
}, },
} }

2
pkg/registry/fake_etcd_client.go
View File

@ -32,7 +32,7 @@ type FakeEtcdClient struct {
deletedKeys []string deletedKeys []string
Err error Err error
t *testing.T t *testing.T
Ix int Ix int
} }
func MakeFakeEtcdClient(t *testing.T) *FakeEtcdClient { func MakeFakeEtcdClient(t *testing.T) *FakeEtcdClient {