fix minor error in use_readme_rmd and fix a failing test

benmarwick · Feb 5, 2024 · 6c2116f · 6c2116f
1 parent f71bddc
commit 6c2116f
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 2,250 deletions.
diff --git a/.Rprofile b/.Rprofile
@@ -1 +1 @@
-source("renv/activate.R")
+
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: rrtools
 Type: Package
 Title: Creates a Reproducible Research Compendium
-Version: 0.1.5
+Version: 0.1.6
 Authors@R: c(person("Ben", "Marwick", role = c("aut", "cre"), email = "[email protected]"),
              person("Daniel", "Knitter", role = "ctb"),
              person("Patrick", "Kennedy", role = "ctb"),

diff --git a/R/core_use_readme_rmd.R b/R/core_use_readme_rmd.R
@@ -44,10 +44,9 @@ use_readme_rmd <- function(pkg = ".", render_readme = TRUE) {
 
   use_build_ignore("^README-.*\\.png$", escape = FALSE, pkg = pkg)
 
-  if (uses_git(pkg$path) && !file.exists(pkg$path, ".git", "hooks", "pre-commit")) {
+  if (uses_git(pkg$path)) {
     message("* Adding pre-commit hook")
-    use_git_hook("pre-commit", render_template("readme-rmd-pre-commit.sh"),
-                 pkg = pkg)
+    use_git_hook("pre-commit", render_template("readme-rmd-pre-commit.sh"))
   }
 
   if (render_readme) {