@@ -54,16 +54,17 @@ func Receive(
5454 return nil
5555 }
5656 repoPath := filepath .Join (gitHome , repo )
57+ defer os .RemoveAll (repoPath )
5758 log .Info ("creating repo directory %s" , repoPath )
5859 if _ , err := createRepo (repoPath ); err != nil {
59- err = fmt .Errorf ("Did not create new repo (%s)" , err )
60+ err = fmt .Errorf ("did not create new repo (%s)" , err )
6061
6162 return err
6263 }
6364
6465 log .Info ("writing pre-receive hook under %s" , repoPath )
6566 if err := createPreReceiveHook (gitHome , repoPath ); err != nil {
66- err = fmt .Errorf ("Did not write pre-receive hook (%s)" , err )
67+ err = fmt .Errorf ("did not write pre-receive hook (%s)" , err )
6768 return err
6869 }
6970
@@ -93,19 +94,19 @@ func Receive(
9394 cmd .Stderr = io .MultiWriter (channel .Stderr (), & errbuff )
9495
9596 if err := cmd .Start (); err != nil {
96- err = fmt .Errorf ("Failed to start git pre-receive hook: %s (%s)" , err , errbuff .Bytes ())
97+ err = fmt .Errorf ("failed to start git pre-receive hook: %s (%s)" , err , errbuff .Bytes ())
9798 return err
9899 }
99100
100101 if _ , err := io .Copy (inpipe , channel ); err != nil {
101- err = fmt .Errorf ("Failed to write git objects into the git pre-receive hook (%s)" , err )
102+ err = fmt .Errorf ("failed to write git objects into the git pre-receive hook (%s)" , err )
102103 return err
103104 }
104105
105106 fmt .Println ("Waiting for git-receive to run." )
106107 fmt .Println ("Waiting for deploy." )
107108 if err := cmd .Wait (); err != nil {
108- err = fmt .Errorf ("Failed to run git pre-receive hook: %s (%s)" , errbuff .Bytes (), err )
109+ err = fmt .Errorf ("failed to run git pre-receive hook: %s (%s)" , errbuff .Bytes (), err )
109110 return err
110111 }
111112 if errbuff .Len () > 0 {
@@ -160,16 +161,16 @@ func createPreReceiveHook(gitHome, repoPath string) error {
160161 writePath := filepath .Join (repoPath , "hooks" , "pre-receive" )
161162 fd , err := os .Create (writePath )
162163 if err != nil {
163- return fmt .Errorf ("Cannot create pre-receive hook file at %s (%s)" , writePath , err )
164+ return fmt .Errorf ("cannot create pre-receive hook file at %s (%s)" , writePath , err )
164165 }
165166 defer fd .Close ()
166167
167168 // parse & generate the template anew each receive for each new git home
168169 if err := preReceiveHookTpl .Execute (fd , map [string ]string {"GitHome" : gitHome }); err != nil {
169- return fmt .Errorf ("Cannot write pre-receive hook to %s (%s)" , writePath , err )
170+ return fmt .Errorf ("cannot write pre-receive hook to %s (%s)" , writePath , err )
170171 }
171172 if err := os .Chmod (writePath , 0755 ); err != nil {
172- return fmt .Errorf ("Cannot change pre-receive hook script permissions (%s)" , err )
173+ return fmt .Errorf ("cannot change pre-receive hook script permissions (%s)" , err )
173174 }
174175
175176 return nil
0 commit comments