diff options
Diffstat (limited to 'internal/gitaly/service/remote/update_remote_mirror.go')
| -rw-r--r-- | internal/gitaly/service/remote/update_remote_mirror.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/internal/gitaly/service/remote/update_remote_mirror.go b/internal/gitaly/service/remote/update_remote_mirror.go index a6558d8e4..8919a2516 100644 --- a/internal/gitaly/service/remote/update_remote_mirror.go +++ b/internal/gitaly/service/remote/update_remote_mirror.go @@ -163,7 +163,7 @@ func (s *server) updateRemoteMirror(stream gitalypb.RemoteService_UpdateRemoteMi if firstRequest.GetKeepDivergentRefs() { isAncestor, err := repo.IsAncestor(ctx, git.Revision(remoteTarget), git.Revision(localRef.Target)) if err != nil && !errors.Is(err, localrepo.InvalidCommitError(remoteTarget)) { - return fmt.Errorf("is %q an ancestor of %q: %w", remoteTarget, localRef.Target, err) + return fmt.Errorf("checking for ancestry: %w", err) } if !isAncestor { @@ -193,7 +193,7 @@ func (s *server) updateRemoteMirror(stream gitalypb.RemoteService_UpdateRemoteMi for remoteRef, remoteCommitOID := range toDelete { isAncestor, err := repo.IsAncestor(ctx, git.Revision(remoteCommitOID), git.Revision(defaultBranch)) if err != nil && !errors.Is(err, localrepo.InvalidCommitError(remoteCommitOID)) { - return fmt.Errorf("is %q an ancestor of %q: %w", remoteCommitOID, defaultBranch, err) + return fmt.Errorf("checking for ancestry: %w", err) } if isAncestor { |