errors: Fix format directive for two errors

There are 2 instances in our code base where we have two errors and want
to merge them. While the best fix would be to use `errors.Join()`, for
now, let's just fix the type so that the linter doesn't barf.

2 files changed, 4 insertions, 4 deletions

diff --git a/internal/command/command.go b/internal/command/command.go
index 0067f9836..4d9524028 100644
--- a/internal/command/command.go
+++ b/internal/command/command.go
@@ -410,8 +410,8 @@ func (c *Command) wait() {
 		// The standard library sets exit status -1 if the process was terminated by a signal,
 		// such as the SIGTERM sent when context is done.
 		if exitCode, ok := ExitStatus(c.waitError); ok && exitCode == -1 {
-			//nolint:gitaly-linters // We can only wrap one
-			c.waitError = fmt.Errorf("%s: %w", c.waitError, c.context.Err())
+			// TODO: use errors.Join() to combine errors instead
+			c.waitError = fmt.Errorf("%s: %w", c.waitError.Error(), c.context.Err())
 		}
 	}
 
diff --git a/internal/praefect/middleware/errorhandler.go b/internal/praefect/middleware/errorhandler.go
index 8dbba24de..738f9c1ed 100644
--- a/internal/praefect/middleware/errorhandler.go
+++ b/internal/praefect/middleware/errorhandler.go
@@ -18,8 +18,8 @@ func StreamErrorHandler(registry *protoregistry.Registry, errorTracker tracker.E
 
 		mi, lookupErr := registry.LookupMethod(method)
 		if err != nil {
-			//nolint:gitaly-linters
-			return nil, fmt.Errorf("error when looking up method: %w %v", err, lookupErr)
+			// TODO: use errors.Join() to combine errors instead
+			return nil, fmt.Errorf("error when looking up method: %w %s", err, lookupErr.Error())
 		}
 
 		return newCatchErrorStreamer(stream, errorTracker, mi.Operation, nodeStorage), err