Merge branch 'main' into release-doc-updates

Author: chrisd8088

commands/command_clean.go

@@ -8,6 +8,7 @@ import (
 	"github.com/git-lfs/git-lfs/v3/lfs"
 	"github.com/git-lfs/git-lfs/v3/tools"
 	"github.com/git-lfs/git-lfs/v3/tr"
+	"github.com/rubyist/tracerx"
 	"github.com/spf13/cobra"
 )
 
@@ -76,13 +77,13 @@ func clean(gf *lfs.GitFilter, to io.Writer, from io.Reader, fileName string, fil
 		if stat.Size() != cleaned.Size && len(cleaned.Pointer.Extensions) == 0 {
 			Exit("%s\n%s\n%s", tr.Tr.Get("Files don't match:"), mediafile, tmpfile)
 		}
-		Debug("%s exists", mediafile)
+		tracerx.Printf("%s exists", mediafile)
 	} else {
 		if err := os.Rename(tmpfile, mediafile); err != nil {
 			Panic(err, tr.Tr.Get("Unable to move %s to %s", tmpfile, mediafile))
 		}
 
-		Debug(tr.Tr.Get("Writing %s", mediafile))
+		tracerx.Printf("Writing %s", mediafile)
 	}
 
 	_, err = lfs.EncodePointer(to, cleaned.Pointer)

commands/command_fsck.go

@@ -15,6 +15,7 @@ import (
 	"github.com/git-lfs/git-lfs/v3/lfs"
 	"github.com/git-lfs/git-lfs/v3/tools"
 	"github.com/git-lfs/git-lfs/v3/tr"
+	"github.com/rubyist/tracerx"
 	"github.com/spf13/cobra"
 )
 
@@ -170,7 +171,7 @@ func doFsckPointers(include, exclude string) []corruptPointer {
 	var corruptPointers []corruptPointer
 	gitscanner := lfs.NewGitScanner(cfg, func(p *lfs.WrappedPointer, err error) {
 		if p != nil {
-			Debug(tr.Tr.Get("Examining %v (%v)", p.Oid, p.Name))
+			tracerx.Printf("Examining %v (%v)", p.Oid, p.Name)
 			if !p.Canonical {
 				cp := corruptPointer{
 					blobOid: p.Sha1,
@@ -214,7 +215,7 @@ func doFsckPointers(include, exclude string) []corruptPointer {
 func fsckPointer(name, oid string, size int64) (bool, error) {
 	path := cfg.Filesystem().ObjectPathname(oid)
 
-	Debug(tr.Tr.Get("Examining %v (%v)", name, path))
+	tracerx.Printf("Examining %v (%v)", name, path)
 
 	f, err := os.Open(path)
 	if pErr, pOk := err.(*os.PathError); pOk {

commands/command_logs.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/git-lfs/git-lfs/v3/errors"
 	"github.com/git-lfs/git-lfs/v3/tr"
+	"github.com/rubyist/tracerx"
 	"github.com/spf13/cobra"
 )
 
@@ -37,7 +38,7 @@ func logsShowCommand(cmd *cobra.Command, args []string) {
 		Exit(tr.Tr.Get("Error reading log: %s", name))
 	}
 
-	Debug(tr.Tr.Get("Reading log: %s", name))
+	tracerx.Printf("Reading log: %s", name)
 	os.Stdout.Write(by)
 }
 
@@ -51,7 +52,7 @@ func logsClearCommand(cmd *cobra.Command, args []string) {
 }
 
 func logsBoomtownCommand(cmd *cobra.Command, args []string) {
-	Debug(tr.Tr.Get("Sample debug message"))
+	tracerx.Printf("Sample trace message")
 	err := errors.Wrapf(errors.New(tr.Tr.Get("Sample wrapped error message")), tr.Tr.Get("Sample error message"))
 	Panic(err, tr.Tr.Get("Sample panic message"))
 }

commands/commands.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"fmt"
 	"io"
-	"log"
 	"net"
 	"os"
 	"path/filepath"
@@ -29,7 +28,6 @@ import (
 //go:generate go run ../docs/man/mangen.go
 
 var (
-	Debugging    = false
 	ErrorBuffer  = &bytes.Buffer{}
 	ErrorWriter  = newMultiWriter(os.Stderr, ErrorBuffer)
 	OutputWriter = newMultiWriter(os.Stdout, ErrorBuffer)
@@ -237,23 +235,14 @@ func FullError(err error) {
 }
 
 func errorWith(err error, fatalErrFn func(error, string, ...interface{}), errFn func(string, ...interface{})) {
-	if Debugging || errors.IsFatalError(err) {
+	if errors.IsFatalError(err) {
 		fatalErrFn(err, "%s", err)
 		return
 	}
 
 	errFn("%s", err)
 }
 
-// Debug prints a formatted message if debugging is enabled.  The formatted
-// message also shows up in the panic log, if created.
-func Debug(format string, args ...interface{}) {
-	if !Debugging {
-		return
-	}
-	log.Printf(format, args...)
-}
-
 // LoggedError prints the given message formatted with its arguments (if any) to
 // Stderr. If an empty string is passed as the "format" argument, only the
 // standard error logging message will be printed, and the error's body will be