fix for naughty naughty directory recursion in Windows #111
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
On Windows the root drive will appear as C:\, so this check should sanitize the directory path and look at the last character, as per the filepath docs
| @@ -92,7 +92,8 @@ func resolveGitDir() (string, string, error) { | |||
| } | |||
|
|
|||
| func recursiveResolveGitDir(dir string) (string, string, error) { | |||
| if len(dir) == 1 && dir[0] == os.PathSeparator { | |||
| var cleanDir = filepath.Clean(dir) | |||
| if cleanDir[len(cleanDir)-1] == os.PathSeparator { | |||
There was a problem hiding this comment.
Should we just check that len(cleanDir) is 1 and cleanDir[0] == os.PathSeparator?
There was a problem hiding this comment.
Ohhh I see now. I was thinking it was changing "C:" to just "". That's dumb though. ENDING slash.
technoweenie
added a commit
that referenced
this pull request
Sep 3, 2014
fix for naughty naughty directory recursion in Windows
|
Huzzah! |
|
|
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.
Fixes #108
Obligatory warning:
After being shouted at by the go compiler a bunch, I think I've found a better way to check for the filesystem root using a gem in the
filepathdocs:http://golang.org/pkg/path/filepath/#Clean
Combining that with checking the last character on the file path (not the only character) should catch this issue we're facing with finding the root of a Windows drive.
Thoughts?