resolve master conflict

commands/command_pre_push.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/git-lfs/git-lfs/git"
 	"github.com/git-lfs/git-lfs/lfs"
+	"github.com/rubyist/tracerx"
 	"github.com/spf13/cobra"
 )
 
@@ -66,6 +67,8 @@ func prePushCommand(cmd *cobra.Command, args []string) {
 			continue
 		}
 
+		tracerx.Printf("pre-push: %s", line)
+
 		left, right := decodeRefs(line)
 		if left == prePushDeleteBranch {
 			continue

httputil/http.go

@@ -272,7 +272,7 @@ func (c *CountingReadCloser) Read(b []byte) (int, error) {
 
 	c.Count += n
 
-	if c.isTraceableType {
+	if n > 0 && c.isTraceableType {
 		chunk := string(b[0:n])
 		if c.useGitTrace {
 			tracerx.Printf("HTTP: %s", chunk)