💅 Tweak wording

mislav · mislav · commit 00bdedb4184a · 2020-08-11T17:06:36.000+02:00
diff --git a/pkg/cmd/repo/clone/clone.go b/pkg/cmd/repo/clone/clone.go
@@ -35,16 +35,18 @@ func NewCmdClone(f *cmdutil.Factory, runF func(*CloneOptions) error) *cobra.Comm
 	}
 
 	cmd := &cobra.Command{
-		Use:   "clone <repository> [<directory>] -- [<gitflags>...]",
+		DisableFlagsInUseLine: true,
+
+		Use:   "clone <repository> [<directory>] [-- <gitflags>...]",
 		Args:  cobra.MinimumNArgs(1),
 		Short: "Clone a repository locally",
-		Long: heredoc.Doc(
-			`Clone a GitHub repository locally.
+		Long: heredoc.Doc(`
+			Clone a GitHub repository locally.
 
 			If the "OWNER/" portion of the "OWNER/REPO" repository argument is omitted, it
 			defaults to the name of the authenticating user.
 			
-			To pass 'git clone' flags, separate them with '--'.
+			Pass additional 'git clone' flags by listing them after '--'.
 		`),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			opts.Repository = args[0]
@@ -62,7 +64,7 @@ func NewCmdClone(f *cmdutil.Factory, runF func(*CloneOptions) error) *cobra.Comm
 		if err == pflag.ErrHelp {
 			return err
 		}
-		return &cmdutil.FlagError{Err: fmt.Errorf("%v\nSeparate git clone flags with `--`.", err)}
+		return &cmdutil.FlagError{Err: fmt.Errorf("%w\nSeparate git clone flags with '--'.", err)}
 	})
 
 	return cmd
diff --git a/pkg/cmd/repo/clone/clone_test.go b/pkg/cmd/repo/clone/clone_test.go
@@ -181,11 +181,8 @@ func Test_RepoClone_withoutUsername(t *testing.T) {
 }
 
 func Test_RepoClone_flagError(t *testing.T) {
-	reg := &httpmock.Registry{}
-	httpClient := &http.Client{Transport: reg}
-
-	_, err := runCloneCommand(httpClient, "--depth 1 OWNER/REPO")
-	if err == nil || err.Error() != "unknown flag: --depth\nSeparate git clone flags with `--`." {
+	_, err := runCloneCommand(nil, "--depth 1 OWNER/REPO")
+	if err == nil || err.Error() != "unknown flag: --depth\nSeparate git clone flags with '--'." {
 		t.Errorf("unexpected error %v", err)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -181,11 +181,8 @@ func Test_RepoClone_withoutUsername(t *testing.T) {`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`func Test_RepoClone_flagError(t *testing.T) {`
`184`		`- reg := &httpmock.Registry{}`
`185`		`- httpClient := &http.Client{Transport: reg}`
`186`		`-`
`187`		`- _, err := runCloneCommand(httpClient, "--depth 1 OWNER/REPO")`
`188`		- if err == nil \|\| err.Error() != "unknown flag: --depth\nSeparate git clone flags with `--`." {
	`184`	`+ _, err := runCloneCommand(nil, "--depth 1 OWNER/REPO")`
	`185`	`+ if err == nil \|\| err.Error() != "unknown flag: --depth\nSeparate git clone flags with '--'." {`
`189`	`186`	`t.Errorf("unexpected error %v", err)`
`190`	`187`	`}`
`191`	`188`	`}`