grim/convey

Fix #110

2017-06-18, Eric Fritz
bfe6950d167e
Parents 645b5749078c
Children fafb3da937ab
Fix #110
2 files changed, 6 insertions(+), 6 deletions(-)
  • +3 -3
    environment/git.go
  • +3 -3
    environment/hg.go
    • --- a/environment/git.go Tue May 30 20:45:02 2017 -0500
    +++ b/environment/git.go Sun Jun 18 16:59:34 2017 -0500
    @@ -25,12 +25,12 @@
    func addGitEnv(envvar string, args ...string) string {
    cmd := exec.Command("git", args...)
    -
    output, _ := cmd.Output()
    + trimmed := strings.TrimSpace(string(output))
    - os.Setenv(envvar, strings.TrimSpace(string(output)))
    + os.Setenv(envvar, trimmed)
    - return string(output)
    + return trimmed
    }
    func initializeGit() []string {
    --- a/environment/hg.go Tue May 30 20:45:02 2017 -0500
    +++ b/environment/hg.go Sun Jun 18 16:59:34 2017 -0500
    @@ -24,12 +24,12 @@
    func addHGEnv(envvar, template string) string {
    cmd := exec.Command("hg", "log", "-r", ".", "-T", template)
    -
    output, _ := cmd.Output()
    + trimmed := string(output)
    - os.Setenv(envvar, string(output))
    + os.Setenv(envvar, trimmed)
    - return string(output)
    + return trimmed
    }
    func initializeHG() []string {