Unprefix github.user because it is generic enough

r-lib · Jun 16, 2012 · 61560cc · 61560cc
1 parent a970806
commit 61560cc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/R/install-github.r b/R/install-github.r
@@ -14,7 +14,7 @@
 #' \dontrun{
 #' install_github("roxygen")
 #' }
-install_github <- function(repo, username = getOption("devtools.github.user"), branch = "master", subdir = NULL, ...) {
+install_github <- function(repo, username = getOption("github.user"), branch = "master", subdir = NULL, ...) {
   message("Installing github repo(s) ", 
     paste(repo, branch, sep = "/", collapse = ", "), 
     " from ", 

diff --git a/R/zzz.r b/R/zzz.r
@@ -68,7 +68,7 @@ current_ver <- function() {
   op <- options()
   op.devtools <- list(
     devtools.path="~/R-dev",
-    devtools.github.user="hadley"
+    github.user="hadley"
   )
   toset <- !(names(op.devtools) %in% names(op))
   if(any(toset)) options(op.devtools[toset])