Avoid triggering recovery mechanism when cancelling issue/pr create

mislav · mislav · commit fff051468eb7 · 2021-02-23T19:42:41.000+01:00
diff --git a/pkg/cmd/issue/create/create.go b/pkg/cmd/issue/create/create.go
@@ -249,8 +249,8 @@ func createRun(opts *CreateOptions) (err error) {
 
 		if action == prShared.CancelAction {
 			fmt.Fprintln(opts.IO.ErrOut, "Discarding.")
-			err = cmdutil.SilentError
-			return
+			err = nil // avoid triggering PreserveInput
+			return cmdutil.SilentError
 		}
 	} else {
 		if tb.Title == "" {
diff --git a/pkg/cmd/pr/create/create.go b/pkg/cmd/pr/create/create.go
@@ -299,8 +299,8 @@ func createRun(opts *CreateOptions) (err error) {
 
 	if action == shared.CancelAction {
 		fmt.Fprintln(opts.IO.ErrOut, "Discarding.")
-		err = cmdutil.SilentError
-		return
+		err = nil // avoid triggering PreserveInput
+		return cmdutil.SilentError
 	}
 
 	err = handlePush(*opts, *ctx)

Original file line number	Diff line number	Diff line change
`@@ -299,8 +299,8 @@ func createRun(opts *CreateOptions) (err error) {`
`299`	`299`
`300`	`300`	`if action == shared.CancelAction {`
`301`	`301`	`fmt.Fprintln(opts.IO.ErrOut, "Discarding.")`
`302`		`- err = cmdutil.SilentError`
`303`		`- return`
	`302`	`+ err = nil // avoid triggering PreserveInput`
	`303`	`+ return cmdutil.SilentError`
`304`	`304`	`}`
`305`	`305`
`306`	`306`	`err = handlePush(opts, ctx)`