From a84a81ed6e602c16460eeb82d69d27ae3247f36a Mon Sep 17 00:00:00 2001 From: Daisuke Fujita Date: Mon, 19 Jun 2017 11:53:52 +0900 Subject: [PATCH 1/2] Remove trailing spaces from generated Gopkg.toml --- testdata/txn_writer/expected_manifest.toml | 6 +++--- txn_writer.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/testdata/txn_writer/expected_manifest.toml b/testdata/txn_writer/expected_manifest.toml index 5c80542960..6b0c8ea43c 100644 --- a/testdata/txn_writer/expected_manifest.toml +++ b/testdata/txn_writer/expected_manifest.toml @@ -6,16 +6,16 @@ # # required = ["github.com/user/thing/cmd/thing"] # ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"] -# +# # [[constraint]] # name = "github.com/user/project" # version = "1.0.0" -# +# # [[constraint]] # name = "github.com/user/project2" # branch = "dev" # source = "github.com/myfork/project2" -# +# # [[override]] # name = "github.com/x/y" # version = "2.4.0" diff --git a/txn_writer.go b/txn_writer.go index 3555121233..97d38fe823 100644 --- a/txn_writer.go +++ b/txn_writer.go @@ -31,16 +31,16 @@ var exampleTOML = []byte(` # # required = ["github.com/user/thing/cmd/thing"] # ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"] -# +# # [[constraint]] # name = "github.com/user/project" # version = "1.0.0" -# +# # [[constraint]] # name = "github.com/user/project2" # branch = "dev" # source = "github.com/myfork/project2" -# +# # [[override]] # name = "github.com/x/y" # version = "2.4.0" From 672b66b6b013795424dc0646bb7a351427eb2655 Mon Sep 17 00:00:00 2001 From: Daisuke Fujita Date: Mon, 19 Jun 2017 12:15:34 +0900 Subject: [PATCH 2/2] Remove trailing spaces from Gopkg.toml testdata --- .../harness_tests/ensure/empty/case1/final/Gopkg.toml | 6 +++--- .../harness_tests/ensure/override/case1/final/Gopkg.toml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/dep/testdata/harness_tests/ensure/empty/case1/final/Gopkg.toml b/cmd/dep/testdata/harness_tests/ensure/empty/case1/final/Gopkg.toml index ad3e949794..44bbf4f13a 100644 --- a/cmd/dep/testdata/harness_tests/ensure/empty/case1/final/Gopkg.toml +++ b/cmd/dep/testdata/harness_tests/ensure/empty/case1/final/Gopkg.toml @@ -6,16 +6,16 @@ # # required = ["github.com/user/thing/cmd/thing"] # ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"] -# +# # [[constraint]] # name = "github.com/user/project" # version = "1.0.0" -# +# # [[constraint]] # name = "github.com/user/project2" # branch = "dev" # source = "github.com/myfork/project2" -# +# # [[override]] # name = "github.com/x/y" # version = "2.4.0" diff --git a/cmd/dep/testdata/harness_tests/ensure/override/case1/final/Gopkg.toml b/cmd/dep/testdata/harness_tests/ensure/override/case1/final/Gopkg.toml index ad3e949794..44bbf4f13a 100644 --- a/cmd/dep/testdata/harness_tests/ensure/override/case1/final/Gopkg.toml +++ b/cmd/dep/testdata/harness_tests/ensure/override/case1/final/Gopkg.toml @@ -6,16 +6,16 @@ # # required = ["github.com/user/thing/cmd/thing"] # ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"] -# +# # [[constraint]] # name = "github.com/user/project" # version = "1.0.0" -# +# # [[constraint]] # name = "github.com/user/project2" # branch = "dev" # source = "github.com/myfork/project2" -# +# # [[override]] # name = "github.com/x/y" # version = "2.4.0"