lunny/git-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't wait til after the error to capture stdout/stderr

Browse Source
This commit is contained in:
risk danger olson 2016-07-27 16:13:55 -06:00
parent 1999143da4
commit 1e3fca0cb8
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
commands/command_checkout.go
View File

@ -167,6 +167,7 @@ func checkoutWithChan(in <-chan *lfs.WrappedPointer) {
// and which has unexpected side effects (e.g. downloading filtered-out files)
var cmd *exec.Cmd
var updateIdxStdin io.WriteCloser
var updateIdxOut bytes.Buffer
// From this point on, git update-index is running. Code in this loop MUST
// NOT Panic() or otherwise cause the process to exit. If the process exits
@ -210,6 +211,8 @@ func checkoutWithChan(in <-chan *lfs.WrappedPointer) {
if cmd == nil {
// Fire up the update-index command
cmd = exec.Command("git", "update-index", "-q", "--refresh", "--stdin")
cmd.Stdout = &updateIdxOut
cmd.Stderr = &updateIdxOut
updateIdxStdin, err = cmd.StdinPipe()
if err != nil {
Panic(err, "Could not update the index")
@ -228,8 +231,7 @@ func checkoutWithChan(in <-chan *lfs.WrappedPointer) {
if cmd != nil && updateIdxStdin != nil {
updateIdxStdin.Close()
if err := cmd.Wait(); err != nil {
outp, _ := cmd.CombinedOutput()
LoggedError(err, "Error updating the git index\n%v", string(outp))
LoggedError(err, "Error updating the git index:\n%s", updateIdxOut.String())
}
}
}