Merge pull request #846 from mbjones/master

Support packages that are not at the root of a git repository.
r-lib · Jun 19, 2015 · f8dd20e · f8dd20e
2 parents 4d36db5 + b1a3f72
commit f8dd20e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -36,6 +36,8 @@
 
 * Remove explicit `library(testthat)` call in `test()` (#798, @krlmlr)
 
+* Allow release() for packages not located at root of git repository (#845, #846, @mbjones)
+
 # devtools 1.8.0
 
 ## Helpers

diff --git a/R/git.R b/R/git.R
@@ -3,19 +3,19 @@ uses_git <- function(path = ".") {
 }
 
 git_sha1 <- function(n = 10, path = ".") {
-  r <- git2r::repository(path)
+  r <- git2r::repository(path, discover=TRUE)
   sha <- git2r::commits(r, n = 1)[[1]]@sha # sha of most recent commit
   substr(sha, 1, n)
 }
 
 git_uncommitted <- function(path = ".") {
-  r <- git2r::repository(path)
+  r <- git2r::repository(path, discover=TRUE)
   st <- vapply(git2r::status(r), length, integer(1))
   any(st != 0)
 }
 
 git_sync_status <- function(path = ".") {
-  r <- git2r::repository(path)
+  r <- git2r::repository(path, discover=TRUE)
 
   upstream <- git2r::branch_get_upstream(git2r::head(r))
   # fetch(r, branch_remote_name(upstream))
@@ -67,7 +67,7 @@ github_info <- function(path = ".") {
   if (!uses_git(path))
     return(github_dummy)
 
-  r <- git2r::repository(path)
+  r <- git2r::repository(path, discover=TRUE)
   if (!("origin" %in% git2r::remotes(r)))
     return(github_dummy)