From 3ea3bed7acda9b365c45d268342fb52e236f95ed Mon Sep 17 00:00:00 2001
From: noqcks <benny@noqcks.io>
Date: Thu, 3 May 2018 13:50:57 -0400
Subject: [PATCH] fix(templater): add baseDir to gitHead cmd so that directory
 is overwritten

This makes it so that when gitHead is called in a template the git hash
that is returned is the hash of the folder containing the template, not
the hash of the folder where kontemplate is called.
---
 templater/templater.go | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/templater/templater.go b/templater/templater.go
index 3c8d2ccdb..c0eff234f 100644
--- a/templater/templater.go
+++ b/templater/templater.go
@@ -103,7 +103,7 @@ func processFiles(c *context.Context, rs *context.ResourceSet, rp string, files
 }
 
 func templateFile(c *context.Context, rs *context.ResourceSet, filename string) (string, error) {
-	tpl, err := template.New(path.Base(filename)).Funcs(templateFuncs(rs)).Option(failOnMissingKeys).ParseFiles(filename)
+	tpl, err := template.New(path.Base(filename)).Funcs(templateFuncs(c, rs)).Option(failOnMissingKeys).ParseFiles(filename)
 
 	if err != nil {
 		return "", fmt.Errorf("Template %s not found: %v", filename, err)
@@ -163,7 +163,7 @@ func matchesResourceSet(s *[]string, rs *context.ResourceSet) bool {
 	return false
 }
 
-func templateFuncs(rs *context.ResourceSet) template.FuncMap {
+func templateFuncs(c *context.Context, rs *context.ResourceSet) template.FuncMap {
 	m := sprig.TxtFuncMap()
 	m["json"] = func(data interface{}) string {
 		b, _ := json.Marshal(data)
@@ -171,13 +171,13 @@ func templateFuncs(rs *context.ResourceSet) template.FuncMap {
 	}
 	m["passLookup"] = GetFromPass
 	m["gitHEAD"] = func() (string, error) {
-			out, err := exec.Command("git", "rev-parse", "HEAD").Output()
-			if err != nil {
-				return "", err
-			}
-			output := strings.TrimSpace(string(out))
-			return output, nil
+		out, err := exec.Command("git", "-C", c.BaseDir, "rev-parse", "HEAD").Output()
+		if err != nil {
+			return "", err
 		}
+		output := strings.TrimSpace(string(out))
+		return output, nil
+	}
 	m["lookupIPAddr"] = GetIPsFromDNS
 	m["insertFile"] = func(file string) (string, error) {
 		data, err := ioutil.ReadFile(path.Join(rs.Path, file))