Merge pull request #9 from aymanbagabas/update-v6

pjbgf · web-flow · commit 07ef52e798de · 2025-04-09T00:44:28.000+01:00
Update to use v6
diff --git a/README.md b/README.md
@@ -1 +1,20 @@
-# cli
+# Go Git CLI
+
+This provides a Go Git CLI binary using `go-git`.
+
+## Installation
+
+```bash
+go install github.com/go-git/cli/cmd/gogit
+```
+
+## Usage
+
+```bash
+gogit <command> [flags]
+```
+
+## License
+
+This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.
+
diff --git a/cmd/gogit/clone.go b/cmd/gogit/clone.go
@@ -1,23 +1,27 @@
 package main
 
 import (
+	"fmt"
 	"path"
+	"strings"
 
-	"github.com/go-git/go-git/v5"
-	"github.com/go-git/go-git/v5/plumbing/transport"
+	"github.com/go-git/go-git/v6"
+	"github.com/go-git/go-git/v6/plumbing/transport"
 	"github.com/spf13/cobra"
 )
 
 var (
 	cloneBare     bool
 	cloneProgress bool
 	cloneDepth    int
+	cloneTags     bool
 )
 
 func init() {
 	cloneCmd.Flags().BoolVarP(&cloneBare, "bare", "", false, "Create a bare repository")
 	cloneCmd.Flags().BoolVarP(&cloneProgress, "progress", "", true, "Show clone progress")
 	cloneCmd.Flags().IntVarP(&cloneDepth, "depth", "", 0, "Create a shallow clone of that depth")
+	cloneCmd.Flags().BoolVarP(&cloneTags, "tags", "", false, "Clone tags")
 	rootCmd.AddCommand(cloneCmd)
 	rootCmd.CompletionOptions.HiddenDefaultCmd = true
 }
@@ -30,6 +34,11 @@ var cloneCmd = &cobra.Command{
 		dir := path.Base(args[0])
 		if len(args) > 1 {
 			dir = args[1]
+		} else {
+			dir = strings.TrimSuffix(dir, ".git")
+			if cloneBare {
+				dir = dir + ".git"
+			}
 		}
 
 		ep, err := transport.NewEndpoint(args[0])
@@ -41,13 +50,19 @@ var cloneCmd = &cobra.Command{
 			URL:   args[0],
 			Depth: cloneDepth,
 			Auth:  defaultAuth(ep),
+			Bare:  cloneBare,
 		}
 
+		if cloneTags {
+			opts.Tags = git.TagFollowing
+		}
 		if cloneProgress {
 			opts.Progress = cmd.OutOrStdout()
 		}
 
-		_, err = git.PlainClone(dir, cloneBare, &opts)
+		fmt.Fprintf(cmd.ErrOrStderr(), "Cloning into '%s'...\n", dir) //nolint:errcheck
+
+		_, err = git.PlainClone(dir, &opts)
 		return err
 	},
 	DisableFlagsInUseLine: true,
diff --git a/cmd/gogit/fetch.go b/cmd/gogit/fetch.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"math"
 
-	"github.com/go-git/go-git/v5"
-	"github.com/go-git/go-git/v5/plumbing/transport"
+	"github.com/go-git/go-git/v6"
+	"github.com/go-git/go-git/v6/plumbing/transport"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/gogit/main.go b/cmd/gogit/main.go
@@ -5,16 +5,16 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/go-git/go-git/v5/plumbing/transport"
-	"github.com/go-git/go-git/v5/plumbing/transport/ssh"
-	"github.com/go-git/go-git/v5/utils/trace"
+	"github.com/go-git/go-git/v6/plumbing/transport"
+	"github.com/go-git/go-git/v6/plumbing/transport/ssh"
+	"github.com/go-git/go-git/v6/utils/trace"
 	"github.com/spf13/cobra"
 	gossh "golang.org/x/crypto/ssh"
 )
 
 var rootCmd = &cobra.Command{
-	Use:   "ggit [<args>] <command>",
-	Short: "ggit is a Git CLI that uses go-git as its backend.",
+	Use:   "gogit [<args>] <command>",
+	Short: "gogit is a Git CLI that uses go-git as its backend.",
 	RunE: func(cmd *cobra.Command, _ []string) error {
 		return cmd.Usage()
 	},
diff --git a/cmd/gogit/pull.go b/cmd/gogit/pull.go
@@ -3,8 +3,8 @@ package main
 import (
 	"errors"
 
-	"github.com/go-git/go-git/v5"
-	"github.com/go-git/go-git/v5/plumbing/transport"
+	"github.com/go-git/go-git/v6"
+	"github.com/go-git/go-git/v6/plumbing/transport"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/gogit/push.go b/cmd/gogit/push.go
@@ -3,9 +3,9 @@ package main
 import (
 	"errors"
 
-	"github.com/go-git/go-git/v5"
-	"github.com/go-git/go-git/v5/config"
-	"github.com/go-git/go-git/v5/plumbing/transport"
+	"github.com/go-git/go-git/v6"
+	"github.com/go-git/go-git/v6/config"
+	"github.com/go-git/go-git/v6/plumbing/transport"
 	"github.com/spf13/cobra"
 	"golang.org/x/term"
 )
diff --git a/cmd/gogit/receive-pack.go b/cmd/gogit/receive-pack.go
@@ -0,0 +1,45 @@
+package main
+
+import (
+	"os"
+
+	"github.com/go-git/go-git/v6"
+	"github.com/go-git/go-git/v6/plumbing/transport"
+	"github.com/spf13/cobra"
+)
+
+var (
+	receivePackStatelessRPC  bool
+	receivePackAdvertiseRefs bool
+)
+
+func init() {
+	receivePackCmd.Flags().BoolVarP(&receivePackStatelessRPC, "stateless-rpc", "", false, "Use stateless RPC")
+	receivePackCmd.Flags().BoolVarP(&receivePackAdvertiseRefs, "advertise-refs", "", false, "Advertise refs")
+
+	rootCmd.AddCommand(receivePackCmd)
+}
+
+var receivePackCmd = &cobra.Command{
+	Use:   "receive-pack <directory>",
+	Short: "Run the receive-pack service",
+	Args:  cobra.ExactArgs(1),
+	RunE: func(cmd *cobra.Command, args []string) error {
+		r, err := git.PlainOpen(args[0])
+		if err != nil {
+			return err
+		}
+
+		return transport.ReceivePack(
+			cmd.Context(),
+			r.Storer,
+			os.Stdin,
+			os.Stdout,
+			&transport.ReceivePackOptions{
+				GitProtocol:   os.Getenv("GIT_PROTOCOL"),
+				StatelessRPC:  receivePackStatelessRPC,
+				AdvertiseRefs: receivePackAdvertiseRefs,
+			},
+		)
+	},
+}
diff --git a/cmd/gogit/update-server-info.go b/cmd/gogit/update-server-info.go
@@ -0,0 +1,26 @@
+package main
+
+import (
+	"github.com/go-git/go-git/v6"
+	"github.com/go-git/go-git/v6/plumbing/transport"
+	"github.com/go-git/go-git/v6/storage/filesystem"
+	"github.com/spf13/cobra"
+)
+
+func init() {
+	rootCmd.AddCommand(updateServerInfoCmd)
+}
+
+var updateServerInfoCmd = &cobra.Command{
+	Use:   "update-server-info",
+	Short: "Update the server info file",
+	RunE: func(cmd *cobra.Command, args []string) error {
+		r, err := git.PlainOpen(".")
+		if err != nil {
+			return err
+		}
+
+		fs := r.Storer.(*filesystem.Storage).Filesystem()
+		return transport.UpdateServerInfo(r.Storer, fs)
+	},
+}
diff --git a/cmd/gogit/upload-pack.go b/cmd/gogit/upload-pack.go
@@ -0,0 +1,56 @@
+package main
+
+import (
+	"context"
+	"os"
+	"time"
+
+	"github.com/go-git/go-git/v6"
+	"github.com/go-git/go-git/v6/plumbing/transport"
+	"github.com/spf13/cobra"
+)
+
+var (
+	uploadPackStatelessRPC  bool
+	uploadPackAdvertiseRefs bool
+	uploadPackTimeout       int
+)
+
+func init() {
+	uploadPackCmd.Flags().BoolVarP(&uploadPackStatelessRPC, "stateless-rpc", "", false, "Use stateless RPC")
+	uploadPackCmd.Flags().BoolVarP(&uploadPackAdvertiseRefs, "advertise-refs", "", false, "Advertise refs")
+	uploadPackCmd.Flags().IntVarP(&uploadPackTimeout, "timeout", "", 0, "Timeout in seconds")
+
+	rootCmd.AddCommand(uploadPackCmd)
+}
+
+var uploadPackCmd = &cobra.Command{
+	Use:   "upload-pack [options] <directory>",
+	Short: "Run the upload-pack service",
+	Args:  cobra.ExactArgs(1),
+	RunE: func(cmd *cobra.Command, args []string) error {
+		r, err := git.PlainOpen(args[0])
+		if err != nil {
+			return err
+		}
+
+		ctx := cmd.Context()
+		if uploadPackTimeout > 0 {
+			var cancel context.CancelFunc
+			ctx, cancel = context.WithTimeout(ctx, time.Duration(uploadPackTimeout)*time.Second)
+			defer cancel()
+		}
+
+		return transport.UploadPack(
+			ctx,
+			r.Storer,
+			os.Stdin,
+			os.Stdout,
+			&transport.UploadPackOptions{
+				GitProtocol:   os.Getenv("GIT_PROTOCOL"),
+				StatelessRPC:  uploadPackStatelessRPC,
+				AdvertiseRefs: uploadPackAdvertiseRefs,
+			},
+		)
+	},
+}
diff --git a/go.mod b/go.mod
@@ -1,30 +1,30 @@
-module github.com/go-git/gogit
+module github.com/go-git/cli
 
-go 1.23.4
+go 1.23.0
 
 require (
-	github.com/go-git/go-git/v5 v5.13.0
+	github.com/go-git/go-git/v6 v6.0.0-20250407095008-f3dca17d9094
 	github.com/spf13/cobra v1.8.1
+	golang.org/x/crypto v0.36.0
+	golang.org/x/term v0.30.0
 )
 
 require (
 	dario.cat/mergo v1.0.1 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
-	github.com/ProtonMail/go-crypto v1.1.3 // indirect
-	github.com/cloudflare/circl v1.5.0 // indirect
-	github.com/cyphar/filepath-securejoin v0.3.5 // indirect
+	github.com/ProtonMail/go-crypto v1.1.6 // indirect
+	github.com/cloudflare/circl v1.6.0 // indirect
+	github.com/cyphar/filepath-securejoin v0.4.1 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
-	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
+	github.com/go-git/gcfg/v2 v2.0.1 // indirect
 	github.com/go-git/go-billy/v5 v5.6.0 // indirect
 	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
-	github.com/pjbgf/sha1cd v0.3.0 // indirect
+	github.com/pjbgf/sha1cd v0.3.2 // indirect
 	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	golang.org/x/crypto v0.31.0 // indirect
-	golang.org/x/exp v0.0.0-20241215155358-4a5509556b9e // indirect
-	golang.org/x/net v0.33.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
-	gopkg.in/warnings.v0 v0.1.2 // indirect
+	golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
+	golang.org/x/net v0.37.0 // indirect
+	golang.org/x/sys v0.31.0 // indirect
 )
diff --git a/go.sum b/go.sum

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ import (`
`4`	`4`	`"errors"`
`5`	`5`	`"math"`
`6`	`6`
`7`		`- "github.com/go-git/go-git/v5"`
`8`		`- "github.com/go-git/go-git/v5/plumbing/transport"`
	`7`	`+ "github.com/go-git/go-git/v6"`
	`8`	`+ "github.com/go-git/go-git/v6/plumbing/transport"`
`9`	`9`	`"github.com/spf13/cobra"`
`10`	`10`	`)`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ package main`
`3`	`3`	`import (`
`4`	`4`	`"errors"`
`5`	`5`
`6`		`- "github.com/go-git/go-git/v5"`
`7`		`- "github.com/go-git/go-git/v5/plumbing/transport"`
	`6`	`+ "github.com/go-git/go-git/v6"`
	`7`	`+ "github.com/go-git/go-git/v6/plumbing/transport"`
`8`	`8`	`"github.com/spf13/cobra"`
`9`	`9`	`)`
`10`	`10`