Compile in debug mode when in git submodule #3639
Merged
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
We currently compile in debug mode if there is a `.git` directory in the project root. This compiles Rubinius in debug mode even if `.git` is a file, so that we compile in debug mode when rubinius is in a git submodule.
| @@ -3,6 +3,11 @@ def git_directory | |||
| File.directory?(git_dir) && git_dir | |||
| end | |||
|
|
|||
| def in_git? | |||
| git_dir = File.expand_path "../../.git", __FILE__ | |||
| File.exist?(git_dir) && git_dir | |||
There was a problem hiding this comment.
Why is there the extra && git_dir here? As far as I'm aware File.expand_path never returns nil.
There was a problem hiding this comment.
@yorickpeterse I'm assuming it's just copied from above. The code in git_directory does that to pass the path back. A multi-clause conditional would have made that more clear. Since #in_git? looks like it's only intended to be a predicate, passing the path back doesn't appear needed, but it doesn't hurt either. Since this code will all be rewritten in bash soon-ish, it doesn't matter.
I'll merge and if you want to clean it up, feel free.
|
@dylanmckay just to check my understanding on a couple points:
|
|
|
@dylanmckay ok, cool, 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.
We currently compile in debug mode if there is a
.gitdirectory in the projectroot.
This compiles Rubinius in debug mode even if
.gitis a file, so thatwe compile in debug mode when rubinius is in a git submodule.