Merge branch '143-inherit-tz' into 'master'

Inherit the TZ environment variable

See merge request !201

3 files changed, 41 insertions, 0 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7eded313c..960b6eeb2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Gitaly changelog
 
+UNRELEASED
+
+- Ensure that sub-processes inherit TZ environment variable
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/201
+
 v0.14.0
 
 - Added integration test for SSH, and a client package
diff --git a/internal/helper/command.go b/internal/helper/command.go
index 61d672a91..d66eed92a 100644
--- a/internal/helper/command.go
+++ b/internal/helper/command.go
@@ -34,6 +34,7 @@ func NewCommand(cmd *exec.Cmd, stdin io.Reader, stdout, stderr io.Writer, env ..
 		fmt.Sprintf("HOME=%s", os.Getenv("HOME")),
 		fmt.Sprintf("PATH=%s", os.Getenv("PATH")),
 		fmt.Sprintf("LD_LIBRARY_PATH=%s", os.Getenv("LD_LIBRARY_PATH")),
+		fmt.Sprintf("TZ=%s", os.Getenv("TZ")),
 	}
 	cmd.Env = append(cmd.Env, env...)
 
diff --git a/internal/helper/command_test.go b/internal/helper/command_test.go
new file mode 100644
index 000000000..58192a69c
--- /dev/null
+++ b/internal/helper/command_test.go
@@ -0,0 +1,35 @@
+package helper
+
+import (
+	"bytes"
+	"os"
+	"os/exec"
+	"testing"
+)
+
+func TestNewCommand_Env(t *testing.T) {
+	oldTZ := os.Getenv("TZ")
+	defer os.Setenv("TZ", oldTZ)
+
+	os.Setenv("TZ", "foobar")
+
+	buff := &bytes.Buffer{}
+	cmd, err := NewCommand(exec.Command("env"), nil, buff, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err = cmd.Wait(); err != nil {
+		t.Fatal(err)
+	}
+
+	found := false
+	split := bytes.Split(buff.Bytes(), []byte("\n"))
+	for _, line := range split {
+		if bytes.Compare(line, []byte("TZ=foobar")) == 0 {
+			found = true
+		}
+	}
+	if !found {
+		t.Errorf("TZ not set to `foobar`")
+	}
+}