From e01811006db5ac63e209e1baa14847ff913540a8 Mon Sep 17 00:00:00 2001 From: Tamir Duberstein Date: Wed, 27 May 2015 19:51:30 -0400 Subject: [PATCH 1/2] Style --- convert.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/convert.go b/convert.go index 483c189..14bd24a 100644 --- a/convert.go +++ b/convert.go @@ -51,8 +51,7 @@ func Translate(c *Config) error { // Write build tags, if applicable. if len(c.Tags) > 0 { - _, err = fmt.Fprintf(bfd, "// +build %s\n\n", c.Tags) - if err != nil { + if _, err = fmt.Fprintf(bfd, "// +build %s\n\n", c.Tags); err != nil { return err } } From 36d53ead3ab6dcdcb468261cad9273522de5e8f1 Mon Sep 17 00:00:00 2001 From: Tamir Duberstein Date: Wed, 27 May 2015 19:52:02 -0400 Subject: [PATCH 2/2] Insert "generated by" comments This allows Github to suppress diffs in generated files. --- convert.go | 23 +++++++++++++++++++++++ testdata/out/compress-memcopy.go | 7 +++++++ testdata/out/compress-nomemcopy.go | 7 +++++++ testdata/out/debug.go | 7 +++++++ testdata/out/nocompress-memcopy.go | 7 +++++++ testdata/out/nocompress-nomemcopy.go | 7 +++++++ 6 files changed, 58 insertions(+) diff --git a/convert.go b/convert.go index 14bd24a..178c450 100644 --- a/convert.go +++ b/convert.go @@ -49,6 +49,29 @@ func Translate(c *Config) error { bfd := bufio.NewWriter(fd) defer bfd.Flush() + // Write the header. This makes e.g. Github ignore diffs in generated files. + if _, err = fmt.Fprint(bfd, "// Code generated by go-bindata.\n"); err != nil { + return err + } + if _, err = fmt.Fprint(bfd, "// sources:\n"); err != nil { + return err + } + + wd, err := os.Getwd() + if err != nil { + return err + } + + for _, asset := range toc { + relative, _ := filepath.Rel(wd, asset.Path) + if _, err = fmt.Fprintf(bfd, "// %s\n", relative); err != nil { + return err + } + } + if _, err = fmt.Fprint(bfd, "// DO NOT EDIT!\n"); err != nil { + return err + } + // Write build tags, if applicable. if len(c.Tags) > 0 { if _, err = fmt.Fprintf(bfd, "// +build %s\n\n", c.Tags); err != nil { diff --git a/testdata/out/compress-memcopy.go b/testdata/out/compress-memcopy.go index a0168d0..e99b31c 100644 --- a/testdata/out/compress-memcopy.go +++ b/testdata/out/compress-memcopy.go @@ -1,3 +1,10 @@ +// Code generated by go-bindata. +// sources: +// in/a/test.asset +// in/b/test.asset +// in/c/test.asset +// in/test.asset +// DO NOT EDIT! package main import ( diff --git a/testdata/out/compress-nomemcopy.go b/testdata/out/compress-nomemcopy.go index 5ca481f..77f4dc4 100644 --- a/testdata/out/compress-nomemcopy.go +++ b/testdata/out/compress-nomemcopy.go @@ -1,3 +1,10 @@ +// Code generated by go-bindata. +// sources: +// in/a/test.asset +// in/b/test.asset +// in/c/test.asset +// in/test.asset +// DO NOT EDIT! package main import ( diff --git a/testdata/out/debug.go b/testdata/out/debug.go index 5bfe7d9..f5426e4 100644 --- a/testdata/out/debug.go +++ b/testdata/out/debug.go @@ -1,3 +1,10 @@ +// Code generated by go-bindata. +// sources: +// in/a/test.asset +// in/b/test.asset +// in/c/test.asset +// in/test.asset +// DO NOT EDIT! package main import ( diff --git a/testdata/out/nocompress-memcopy.go b/testdata/out/nocompress-memcopy.go index 73fcaef..95a4dba 100644 --- a/testdata/out/nocompress-memcopy.go +++ b/testdata/out/nocompress-memcopy.go @@ -1,3 +1,10 @@ +// Code generated by go-bindata. +// sources: +// in/a/test.asset +// in/b/test.asset +// in/c/test.asset +// in/test.asset +// DO NOT EDIT! package main import ( diff --git a/testdata/out/nocompress-nomemcopy.go b/testdata/out/nocompress-nomemcopy.go index cb8e920..2b50e38 100644 --- a/testdata/out/nocompress-nomemcopy.go +++ b/testdata/out/nocompress-nomemcopy.go @@ -1,3 +1,10 @@ +// Code generated by go-bindata. +// sources: +// in/a/test.asset +// in/b/test.asset +// in/c/test.asset +// in/test.asset +// DO NOT EDIT! package main import (