commit 19292ead3a1b578a2b99cba4de06538ac8b3cdb1
author Ankur Mittal <anmittal@google.com> Thu May 24 11:34:54 2018 -0700
committer Ankur Mittal <anmittal@google.com> Thu May 24 11:34:54 2018 -0700
tree 251ba3c036e8247e5f3c67188b845d7d3552840e
parent 1370cec5a450134576c455522992d8e06db62047

Log error when git command fails

This will help us debug issue TO-960

Change-Id: I60dbe55628939c0de5b70023374d447389183cf4

gitutil/git.go

diff --git a/gitutil/git.go b/gitutil/git.go
index 832a59a..fe0e07c 100644
--- a/gitutil/git.go
+++ b/gitutil/git.go
@@ -23,14 +23,16 @@
 	Args        []string
 	Output      string
 	ErrorOutput string
+	err         error
 }
 
-func Error(output, errorOutput, root string, args ...string) GitError {
+func Error(output, errorOutput string, err error, root string, args ...string) GitError {
 	return GitError{
 		Root:        root,
 		Args:        args,
 		Output:      output,
 		ErrorOutput: errorOutput,
+		err:         err,
 	}
 }
 
@@ -39,7 +41,8 @@
 	result = "'git "
 	result += strings.Join(ge.Args, " ")
 	result += "' failed:\n"
-	result += ge.Output + "\n" + ge.ErrorOutput
+	result += ge.ErrorOutput
+	result += "\ncommand fail error: " + ge.err.Error()
 	return result
 }
 
@@ -992,7 +995,7 @@
 func (g *Git) run(args ...string) error {
 	var stdout, stderr bytes.Buffer
 	if err := g.runGit(&stdout, &stderr, args...); err != nil {
-		return Error(stdout.String(), stderr.String(), g.rootDir, args...)
+		return Error(stdout.String(), stderr.String(), err, g.rootDir, args...)
 	}
 	return nil
 }
@@ -1008,7 +1011,7 @@
 func (g *Git) runOutput(args ...string) ([]string, error) {
 	var stdout, stderr bytes.Buffer
 	if err := g.runGit(&stdout, &stderr, args...); err != nil {
-		return nil, Error(stdout.String(), stderr.String(), g.rootDir, args...)
+		return nil, Error(stdout.String(), stderr.String(), err, g.rootDir, args...)
 	}
 	return trimOutput(stdout.String()), nil
 }
@@ -1018,7 +1021,7 @@
 	// In order for the editing to work correctly with
 	// terminal-based editors, notably "vim", use os.Stdout.
 	if err := g.runGit(os.Stdout, &stderr, args...); err != nil {
-		return Error("", stderr.String(), g.rootDir, args...)
+		return Error("", stderr.String(), err, g.rootDir, args...)
 	}
 	return nil
 }