Support packages that are not at the root of a git repository. #846
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This fix adds 'discover=T' to git2r:repository() calls in order to allow devtools to locate the repository root directory when the package is in a subdirectory of the overall git repository. This change should address issue r-lib#845.
| @@ -3,19 +3,19 @@ uses_git <- function(path = ".") { | |||
| } | |||
|
|
|||
| git_sha1 <- function(n = 10, path = ".") { | |||
| r <- git2r::repository(path) | |||
| r <- git2r::repository(path, discover=T) | |||
There was a problem hiding this comment.
Could you please use discover = TRUE?
|
Thanks - could you please also add a bullet point to NEWS? |
|
Yes, I'll change to use 'TRUE', and add a bullet to news in a revised PR. More soon... |
|
@hadley I made the changes you requested, and tests passed on my local Mac deployment, as well as in Travis. I'm not clear on your development workflow -- do you want PRs to fix the codecov issues? Or does this look good now? |
|
codecov is mostly informatively - I'm still experimenting with it. |
hadley
added a commit
that referenced
this pull request
Jun 19, 2015
Support packages that are not at the root of a git repository.
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fix adds 'discover=T' to git2r:repository() calls in order to allow devtools to locate the repository root directory when the package is in a subdirectory of the overall git repository. This change should address issue #845. I have tested this on Mac OS X under R 3.2.0.
I encountered this problem when trying to release() a package that was not at the root of its git repository, and the git_uncommitted() function threw an error as described in #845. After the fix, git_uncommitted() correctly detects the repository root.