Use devtools version of git_uncommitted

jimhester · jimhester · commit 9c7becf1d939 · 2020-07-21T10:16:11.000-04:00
diff --git a/R/check-git.R b/R/check-git.R
@@ -20,7 +20,7 @@ git_report_branch <- function(pkg) {
 
 git_check_uncommitted <- function(pkg) {
   check_status(
-    !asNamespace("usethis")$git_uncommitted(pkg$path),
+    !git_uncommitted(pkg$path),
     "uncommitted files",
     "All files should be tracked and committed before release. Please add and commit."
   )
diff --git a/R/git.R b/R/git.R
@@ -8,7 +8,7 @@ git_branch <- function(path = ".") {
   system2("git", c("rev-parse", "--abbrev-ref", "HEAD"), stdout = TRUE)
 }
 
-git_uncommited <- function(path = ".") {
+git_uncommitted <- function(path = ".") {
   withr::local_dir(path)
 
   out <- system2("git", c("status", "--porcelain=v1"), stdout = TRUE)

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ git_report_branch <- function(pkg) {`
`20`	`20`
`21`	`21`	`git_check_uncommitted <- function(pkg) {`
`22`	`22`	`check_status(`
`23`		`- !asNamespace("usethis")$git_uncommitted(pkg$path),`
	`23`	`+ !git_uncommitted(pkg$path),`
`24`	`24`	`"uncommitted files",`
`25`	`25`	`"All files should be tracked and committed before release. Please add and commit."`
`26`	`26`	`)`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ git_branch <- function(path = ".") {`
`8`	`8`	`system2("git", c("rev-parse", "--abbrev-ref", "HEAD"), stdout = TRUE)`
`9`	`9`	`}`
`10`	`10`
`11`		`-git_uncommited <- function(path = ".") {`
	`11`	`+git_uncommitted <- function(path = ".") {`
`12`	`12`	`withr::local_dir(path)`
`13`	`13`
`14`	`14`	`out <- system2("git", c("status", "--porcelain=v1"), stdout = TRUE)`