Skip to content

Commit b7318d0

Browse files
arschlesAaron Schlesinger
authored andcommitted
fix(git.go): make errors more descriptive
1 parent d175417 commit b7318d0

1 file changed

Lines changed: 8 additions & 6 deletions

File tree

pkg/git/git.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,16 @@ func Receive(c cookoo.Context, p *cookoo.Params) (interface{}, cookoo.Interrupt)
123123

124124
plumbCommand(cmd, channel, &errbuff)
125125

126-
if err := cmd.Run(); err != nil {
127-
log.Warnf(c, "Failed git receive: %s %s", err, errbuff.Bytes())
128-
return nil, fmt.Errorf("Failed git receive immediately: %s (%s)", errbuff.Bytes(), err)
126+
if err := cmd.Start(); err != nil {
127+
err = fmt.Errorf("Failed to start git pre-receive hook: %s (%s)", err, errbuff.Bytes())
128+
log.Warnf(c, err.Error())
129+
return nil, err
129130
}
130-
fmt.Printf("Waiting for git-receive to run.\n")
131-
fmt.Printf("Waiting for deploy.\n")
131+
fmt.Println("Waiting for git-receive to run.")
132+
fmt.Println("Waiting for deploy.")
132133
if err := cmd.Wait(); err != nil {
133-
log.Errf(c, "Error on command: %s %s", err, errbuff.Bytes())
134+
err = fmt.Errorf("Failed to run git pre-receive hook: %s (%s)", errbuff.Bytes(), err)
135+
log.Errf(c, err.Error())
134136
return nil, err
135137
}
136138
if errbuff.Len() > 0 {

0 commit comments

Comments
 (0)