Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ignore non-directories in the top level directory. #7

Merged
merged 2 commits into from
Dec 7, 2016

Conversation

kevina
Copy link
Contributor

@kevina kevina commented Dec 7, 2016

Ignore non-directories in the top level directory to allow placing a README or similar file there.

This is based on #6.

@kevina kevina added the status/in-progress In progress label Dec 7, 2016
@coveralls
Copy link

coveralls commented Dec 7, 2016

Coverage Status

Coverage increased (+1.5%) to 61.935% when pulling 9e8816958a3b094045102f4a1640f5739062572d on kevina/non-file-ignore into 1db836c on master.

@@ -343,6 +343,8 @@ func testQuerySimple(dirFunc mkShardFunc, t *testing.T) {
temp, cleanup := tempdir(t)
defer cleanup()

ioutil.WriteFile(filepath.Join(temp, "README"), []byte("something"), 0666)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

might want to check that this doesnt error, just in case (if it errors and fails to create the file, then the test would pass regardless of the above fix)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops, oversight on my part sorry.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed now.

Ignore non-directories in the top level directory to allow placing a
README or similar file there.
@Kubuxu Kubuxu removed their request for review December 7, 2016 22:43
@coveralls
Copy link

Coverage Status

Coverage increased (+0.5%) to 61.935% when pulling 7ec19f1 on kevina/non-file-ignore into 3567e09 on master.

@coveralls
Copy link

coveralls commented Dec 7, 2016

Coverage Status

Coverage increased (+0.5%) to 61.935% when pulling 7ec19f1 on kevina/non-file-ignore into 3567e09 on master.

Copy link
Member

@whyrusleeping whyrusleeping left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@whyrusleeping whyrusleeping merged commit 9652294 into master Dec 7, 2016
@whyrusleeping whyrusleeping deleted the kevina/non-file-ignore branch December 7, 2016 23:58
@whyrusleeping whyrusleeping removed the status/in-progress In progress label Dec 7, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants