diff --git a/git/client.go b/git/client.go
index b0194affc..560eccfdd 100644
--- a/git/client.go
+++ b/git/client.go
@@ -11,6 +11,7 @@ import (
 	"path"
 	"regexp"
 	"runtime"
+	"slices"
 	"sort"
 	"strings"
 	"sync"
@@ -594,6 +595,10 @@ func (c *Client) Clone(ctx context.Context, cloneURL string, args []string, mods
 		cloneArgs = append(cloneArgs, target)
 	} else {
 		target = path.Base(strings.TrimSuffix(cloneURL, ".git"))
+
+		if slices.Contains(cloneArgs, "--bare") {
+			target += ".git"
+		}
 	}
 	cloneArgs = append([]string{"clone"}, cloneArgs...)
 	cmd, err := c.AuthenticatedCommand(ctx, cloneArgs...)
diff --git a/git/client_test.go b/git/client_test.go
index 420683659..1e3032317 100644
--- a/git/client_test.go
+++ b/git/client_test.go
@@ -1267,6 +1267,7 @@ func TestClientPush(t *testing.T) {
 func TestClientClone(t *testing.T) {
 	tests := []struct {
 		name          string
+		args          []string
 		mods          []CommandModifier
 		cmdExitStatus int
 		cmdStdout     string
@@ -1277,22 +1278,37 @@ func TestClientClone(t *testing.T) {
 	}{
 		{
 			name:        "clone",
+			args:        []string{},
 			wantCmdArgs: `path/to/git -c credential.helper= -c credential.helper=!"gh" auth git-credential clone github.com/cli/cli`,
 			wantTarget:  "cli",
 		},
 		{
 			name:        "accepts command modifiers",
+			args:        []string{},
 			mods:        []CommandModifier{WithRepoDir("/path/to/repo")},
 			wantCmdArgs: `path/to/git -C /path/to/repo -c credential.helper= -c credential.helper=!"gh" auth git-credential clone github.com/cli/cli`,
 			wantTarget:  "cli",
 		},
 		{
 			name:          "git error",
+			args:          []string{},
 			cmdExitStatus: 1,
 			cmdStderr:     "git error message",
 			wantCmdArgs:   `path/to/git -c credential.helper= -c credential.helper=!"gh" auth git-credential clone github.com/cli/cli`,
 			wantErrorMsg:  "failed to run git: git error message",
 		},
+		{
+			name:        "bare clone",
+			args:        []string{"--bare"},
+			wantCmdArgs: `path/to/git -c credential.helper= -c credential.helper=!"gh" auth git-credential clone --bare github.com/cli/cli`,
+			wantTarget:  "cli.git",
+		},
+		{
+			name:        "bare clone with explicit target",
+			args:        []string{"cli-bare", "--bare"},
+			wantCmdArgs: `path/to/git -c credential.helper= -c credential.helper=!"gh" auth git-credential clone --bare github.com/cli/cli cli-bare`,
+			wantTarget:  "cli-bare",
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -1301,7 +1317,7 @@ func TestClientClone(t *testing.T) {
 				GitPath:        "path/to/git",
 				commandContext: cmdCtx,
 			}
-			target, err := client.Clone(context.Background(), "github.com/cli/cli", []string{}, tt.mods...)
+			target, err := client.Clone(context.Background(), "github.com/cli/cli", tt.args, tt.mods...)
 			assert.Equal(t, tt.wantCmdArgs, strings.Join(cmd.Args[3:], " "))
 			if tt.wantErrorMsg == "" {
 				assert.NoError(t, err)