git: incorporate most of the PR feedback

mhagger · mhagger · commit e9bb4b83d761 · 2025-04-22T00:34:27.000+02:00
diff --git a/config/config.go b/config/config.go
@@ -54,10 +54,6 @@ const (
 	SystemScope
 )
 
-// AnonymousRemoteName is the name that is used for anonymous remotes
-// (i.e., remotes that are not defined in the git config).
-const AnonymousRemoteName = "anonymous"
-
 // Config contains the repository configuration
 // https://www.kernel.org/pub/software/scm/git/docs/git-config.html#FILES
 type Config struct {
@@ -655,13 +651,6 @@ type RemoteConfig struct {
 	raw *format.Subsection
 }
 
-func NewAnonymousRemoteConfig(url string) *RemoteConfig {
-	return &RemoteConfig{
-		Name: AnonymousRemoteName,
-		URLs: []string{url},
-	}
-}
-
 // Validate validates the fields and sets the default values.
 func (c *RemoteConfig) Validate() error {
 	if c.Name == "" {
@@ -742,13 +731,6 @@ func (c *RemoteConfig) marshal() *format.Subsection {
 	return c.raw
 }
 
-// IsAnonymous returns true if c represents an anonymous remote (i.e.,
-// one that was created from an explicit URL rather than from the
-// gitconfig).
-func (c *RemoteConfig) IsAnonymous() bool {
-	return c.Name == AnonymousRemoteName
-}
-
 func (c *RemoteConfig) IsFirstURLLocal() bool {
 	return url.IsLocalEndpoint(c.URLs[0])
 }
diff --git a/config/config_test.go b/config/config_test.go
@@ -288,23 +288,14 @@ func (s *ConfigSuite) TestValidateInvalidRemoteKey() {
 	s.ErrorIs(config.Validate(), ErrInvalid)
 }
 
-func (s *ConfigSuite) TestAnonymousRemoteConfig() {
+func (s *ConfigSuite) TestEphemeralRemoteConfig() {
 	config := &RemoteConfig{
-		Name: "anonymous",
 		URLs: []string{"http://foo/bar"},
 	}
 
 	s.NoError(config.Validate())
-	s.Equal("anonymous", config.Name)
-	s.True(config.IsAnonymous())
-}
-
-func (s *ConfigSuite) TestNewAnonymousRemoteConfig() {
-	config := NewAnonymousRemoteConfig("http://foo/bar")
-
-	s.NoError(config.Validate())
-	s.Equal("anonymous", config.Name)
-	s.True(config.IsAnonymous())
+	s.Empty(config.Name)
+	s.Len(config.URLs, 1)
 }
 
 func (s *ConfigSuite) TestRemoteConfigValidateMissingURL() {
diff --git a/options.go b/options.go
@@ -308,12 +308,12 @@ type ForceWithLease struct {
 
 // Validate validates the fields and sets the default values.
 func (o *PushOptions) Validate() error {
-	if o.RemoteName == "" {
-		if o.RemoteURL != "" {
-			o.RemoteName = config.AnonymousRemoteName
-		} else {
-			o.RemoteName = DefaultRemoteName
-		}
+	if o.RemoteName != "" && o.RemoteURL != "" {
+		return errors.New("remote name and URL cannot be used together")
+	}
+
+	if o.RemoteName == "" && o.RemoteURL == "" {
+		o.RemoteName = DefaultRemoteName
 	}
 
 	if len(o.RefSpecs) == 0 {
diff --git a/remote.go b/remote.go
@@ -74,11 +74,11 @@ func NewRemote(s storage.Storer, c *config.RemoteConfig) *Remote {
 	return &Remote{s: s, c: c}
 }
 
-// IsAnonymous returns true if the remote is anonymous; i.e., if it
+// isEphemeral returns true if this is an ad hoc remote; i.e., if it
 // was created directly from a URL and isn't defined in the git
 // config.
-func (r *Remote) IsAnonymous() bool {
-	return r.c.IsAnonymous()
+func (r *Remote) isEphemeral() bool {
+	return r.c.Name == ""
 }
 
 // Config returns the RemoteConfig object used to instantiate this Remote.
@@ -87,13 +87,19 @@ func (r *Remote) Config() *config.RemoteConfig {
 }
 
 func (r *Remote) String() string {
+	var name string
+	if r.c.Name != "" {
+		name = r.c.Name
+	} else {
+		name = "<unnamed>"
+	}
 	var fetch, push string
 	if len(r.c.URLs) > 0 {
 		fetch = r.c.URLs[0]
 		push = r.c.URLs[len(r.c.URLs)-1]
 	}
 
-	return fmt.Sprintf("%s\t%s (fetch)\n%[1]s\t%[3]s (push)", r.c.Name, fetch, push)
+	return fmt.Sprintf("%s\t%s (fetch)\n%[1]s\t%[3]s (push)", name, fetch, push)
 }
 
 // Push performs a push to the remote. Returns NoErrAlreadyUpToDate if the
@@ -327,9 +333,10 @@ func (r *Remote) addReachableTags(localRefs []*plumbing.Reference, remoteRefs st
 func (r *Remote) updateRemoteReferenceStorage(
 	cmds []*packp.Command,
 ) error {
-	if r.IsAnonymous() {
-		// If the remote is anonymous, then there are no
-		// remote-tracking references corresponding to it.
+	if r.isEphemeral() {
+		// If the remote is ephemeral (i.e., not configured in
+		// gitconfig), then there are no remote-tracking references
+		// corresponding to it.
 		return nil
 	}
 
diff --git a/repository.go b/repository.go
@@ -58,7 +58,6 @@ var (
 	ErrRepositoryAlreadyExists     = errors.New("repository already exists")
 	ErrRemoteNotFound              = errors.New("remote not found")
 	ErrRemoteExists                = errors.New("remote already exists")
-	ErrAnonymousRemoteName         = errors.New("anonymous remote name must be 'anonymous'")
 	ErrWorktreeNotProvided         = errors.New("worktree should be provided")
 	ErrIsBareRepository            = errors.New("worktree not available in a bare repository")
 	ErrUnableToResolveCommit       = errors.New("unable to resolve commit")
@@ -664,24 +663,6 @@ func (r *Repository) CreateRemote(c *config.RemoteConfig) (*Remote, error) {
 	return remote, r.Storer.SetConfig(cfg)
 }
 
-// CreateRemoteAnonymous creates a new anonymous remote. c.Name must
-// be config.AnonymousRemoteName. It's used for the equivalent of
-//
-//	git fetch git@github.com:src-d/go-git.git master:master
-func (r *Repository) CreateRemoteAnonymous(c *config.RemoteConfig) (*Remote, error) {
-	if err := c.Validate(); err != nil {
-		return nil, err
-	}
-
-	if c.Name != config.AnonymousRemoteName {
-		return nil, ErrAnonymousRemoteName
-	}
-
-	remote := NewRemote(r.Storer, c)
-
-	return remote, nil
-}
-
 // DeleteRemote delete a remote from the repository and delete the config
 func (r *Repository) DeleteRemote(name string) error {
 	cfg, err := r.Config()
@@ -1247,21 +1228,9 @@ func (r *Repository) PushContext(ctx context.Context, o *PushOptions) error {
 		return err
 	}
 
-	var remote *Remote
-	if o.RemoteName == config.AnonymousRemoteName {
-		var err error
-		remote, err = r.CreateRemoteAnonymous(
-			config.NewAnonymousRemoteConfig(o.RemoteURL),
-		)
-		if err != nil {
-			return err
-		}
-	} else {
-		var err error
-		remote, err = r.Remote(o.RemoteName)
-		if err != nil {
-			return err
-		}
+	remote, err := r.Remote(o.RemoteName)
+	if err != nil {
+		return err
 	}
 
 	return remote.PushContext(ctx, o)
diff --git a/repository_test.go b/repository_test.go
@@ -357,34 +357,22 @@ func (s *RepositorySuite) TestCreateRemoteInvalid() {
 	s.Nil(remote)
 }
 
-func (s *RepositorySuite) TestCreateRemoteAnonymous() {
+func (s *RepositorySuite) TestCreateRemoteEphemeral() {
 	r, _ := Init(memory.NewStorage(), nil)
-	remote, err := r.CreateRemoteAnonymous(&config.RemoteConfig{
-		Name: "anonymous",
+	remote := NewRemote(r.Storer, &config.RemoteConfig{
 		URLs: []string{"http://foo/foo.git"},
 	})
 
-	s.NoError(err)
-	s.Equal("anonymous", remote.Config().Name)
-	s.True(remote.Config().IsAnonymous())
+	s.Equal("", remote.Config().Name)
 }
 
-func (s *RepositorySuite) TestCreateRemoteAnonymousInvalidName() {
+func (s *RepositorySuite) TestCreateRemoteEphemeralInvalidName() {
 	r, _ := Init(memory.NewStorage(), nil)
-	remote, err := r.CreateRemoteAnonymous(&config.RemoteConfig{
+	remote := NewRemote(r.Storer, &config.RemoteConfig{
 		Name: "not_anonymous",
 		URLs: []string{"http://foo/foo.git"},
 	})
 
-	s.ErrorIs(err, ErrAnonymousRemoteName)
-	s.Nil(remote)
-}
-
-func (s *RepositorySuite) TestCreateRemoteAnonymousInvalid() {
-	r, _ := Init(memory.NewStorage(), nil)
-	remote, err := r.CreateRemoteAnonymous(&config.RemoteConfig{})
-
-	s.ErrorIs(err, config.ErrRemoteConfigEmptyName)
 	s.Nil(remote)
 }
 
@@ -1717,7 +1705,7 @@ func (s *RepositorySuite) TestPush() {
 	})
 }
 
-func (s *RepositorySuite) TestPushAnonymous() {
+func (s *RepositorySuite) TestPushEphemeral() {
 	url := s.T().TempDir()
 
 	server, err := PlainInit(url, true)
@@ -1742,12 +1730,20 @@ func (s *RepositorySuite) TestPushAnonymous() {
 	})
 	s.NoError(err)
 
+	s.Len(c.Remotes, 1)
+
 	AssertReferences(s.T(), server, map[string]string{
 		"refs/heads/master": "6ecf0ef2c2dffb796033e5a02219af86ec6584e5",
 		"refs/heads/branch": "e8d3ffab552895c19b9fcf7aa264d277cde33881",
 	})
 
-	AssertReferences(s.T(), s.Repository, map[string]string{})
+	// Make sure that remote-tracking references were _not_ created.
+	refs, err := s.Repository.References()
+	s.NoError(err)
+	refs.ForEach(func(r *plumbing.Reference) error {
+		s.False(strings.HasPrefix(r.Name().String(), "refs/remotes/"))
+		return nil
+	})
 }
 
 func (s *RepositorySuite) TestPushContext() {
