We have to ui_stop() here

jennybc · jennybc · commit 45b65ff2bd71 · 2021-10-25T15:03:13.000-07:00
diff --git a/R/git-default-branch.R b/R/git-default-branch.R
@@ -522,10 +522,10 @@ challenge_non_default_branch <- function(details = "Are you sure you want to pro
     if (ui_nope("
       Current branch ({ui_value(actual)}) is not repo's default \\
       branch ({ui_value(default_branch)}).{details}")) {
-      ui_oops("Cancelling.")
-      return(invisible())
+      ui_stop("Cancelling. Not on desired branch.")
     }
   }
+  invisible()
 }
 
 report_fishy_files <- function(old_name = "master", new_name = "main") {

Original file line number	Diff line number	Diff line change
`@@ -522,10 +522,10 @@ challenge_non_default_branch <- function(details = "Are you sure you want to pro`
`522`	`522`	`if (ui_nope("`
`523`	`523`	`Current branch ({ui_value(actual)}) is not repo's default \\`
`524`	`524`	`branch ({ui_value(default_branch)}).{details}")) {`
`525`		`- ui_oops("Cancelling.")`
`526`		`- return(invisible())`
	`525`	`+ ui_stop("Cancelling. Not on desired branch.")`
`527`	`526`	`}`
`528`	`527`	`}`
	`528`	`+ invisible()`
`529`	`529`	`}`
`530`	`530`
`531`	`531`	`report_fishy_files <- function(old_name = "master", new_name = "main") {`