fix merge issues

Author: burmudar

cmd/src/login.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io"
 	"net/url"
+	"os"
 
 	"github.com/sourcegraph/src-cli/internal/api"
 	"github.com/sourcegraph/src-cli/internal/clicompat"
@@ -42,10 +43,9 @@ var loginCommand = clicompat.Wrap(&cli.Command{
 	HideVersion: true,
 	Flags:       clicompat.WithAPIFlags(),
 	Action: func(ctx context.Context, cmd *cli.Command) error {
-		var loginEndpointURL *url.URL
 		if cmd.Args().Present() {
 			arg := cmd.Args().First()
-			u, err := parseEndpoint(arg)
+			loginEndpointURL, err := parseEndpoint(arg)
 			if err != nil {
 				return cmderrors.Usage(fmt.Sprintf("invalid endpoint URL: %s", arg))
 			}
@@ -76,13 +76,6 @@ var loginCommand = clicompat.Wrap(&cli.Command{
 			out:         os.Stdout,
 			apiFlags:    apiFlags,
 			oauthClient: oauth.NewClient(oauth.DefaultClientID),
-		return loginCmd(context.Background(), loginParams{
-			cfg:              cfg,
-			client:           client,
-			out:              os.Stdout,
-			apiFlags:         apiFlags,
-			oauthClient:      oauth.NewClient(oauth.DefaultClientID),
-			loginEndpointURL: loginEndpointURL,
 		})
 	},
 })