Skip to content

Rename old master branch to main in .dev/compare_branches #1372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 8, 2022
Merged

Rename old master branch to main in .dev/compare_branches #1372

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .dev/compare_branches.R
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/local/bin/Rscript

# compare the lints obtained before/after a given PR/branch vs a base branch (default master).
# compare the lints obtained before/after a given PR/branch vs a base branch (default main).
#
# How to use:
# See below (param_list <-) for documentation of the script's arguments.
Expand Down Expand Up @@ -71,9 +71,9 @@ param_list <- list(
optparse::make_option(
"--base_branch",
default = if (interactive()) {
readline("Name a branch to use as base (skip to use master): ")
readline("Name a branch to use as base (skip to use main): ")
} else {
"master"
"main"
},
help = "Compare to this branch"
),
Expand Down Expand Up @@ -135,7 +135,7 @@ if (interactive()) {
# typed arguments get cast even when missing, probably to NA
if (isTRUE(is.na(params[[opt]]) || params[[opt]] == "")) params[[opt]] <- NULL
}
if (isTRUE(is.na(params$base_branch) || params$base_branch == "")) params$base_branch <- "master"
if (isTRUE(is.na(params$base_branch) || params$base_branch == "")) params$base_branch <- "main"
}

linter_names <- strsplit(params$linters, ",", fixed = TRUE)[[1L]]
Expand Down Expand Up @@ -308,7 +308,7 @@ run_workflow <- function(what, packages, linter_names, branch, number) {
# safe to use force=TRUE because we're in temp_repo
if (what == "pr") {
# pr_fetch doesn't expose this so use this to reset
gert::git_branch_checkout("master", force = TRUE)
gert::git_branch_checkout("main", force = TRUE)
usethis::pr_fetch(number)
} else {
gert::git_branch_checkout(branch, force = TRUE)
Expand Down