Skip to content
This repository has been archived by the owner on Nov 27, 2018. It is now read-only.

bug fix: partials do not render on Windows 7. #118

Closed
wants to merge 1 commit into from
Closed

bug fix: partials do not render on Windows 7. #118

wants to merge 1 commit into from

Conversation

s-oram
Copy link

@s-oram s-oram commented Jan 20, 2015

This is my first pull request for Punch.

I was attempting to follow the Punch setup tutorial but partials weren't rendering. I found the fix for the
problem here: #102

My system is Windows 7 64bit.

Partials are now rendering after applying the fix. I have no idea what effects the changes will have when run on OSX and other operating systems. Sorry.

@laktek
Copy link
Owner

laktek commented Jan 21, 2015

Thanks for the PR. I'll try to review and test it over the weekend.

Any idea why the diff changes all lines in the file? Can you try to format it to only show the lines that were changed?

@s-oram
Copy link
Author

s-oram commented Jan 22, 2015

I'm not sure why the diff shows all lines as changed. Maybe the line endings have changed?

Anyway, I noticed the problem with the diff on my first attempt to commit the changes. I reset the commit and did it a second time taking more care. Here you can see the two lines that were changed:
https://github.com/veryangrymobster/punch/compare/laktek:master...master

I didn't expect the diff to still have problems when being compared to your files. To fix it I'll need to delete my fork and start from scratch. As it's only two lines would you mind copying the changes manually?

@laktek
Copy link
Owner

laktek commented Jan 22, 2015

You don't have to delete your fork. You can close the previous PR and open
a new PR with this diff.

On Thu, Jan 22, 2015 at 8:54 AM, Shannon Oram [email protected]
wrote:

I'm not sure why the diff shows all lines as changed. Maybe the line
endings have changed?

Anyway, I noticed the problem with the diff on my first attempt to commit
the changes. I reset the commit and did it a second time taking more care.
Here you can see the two lines that were changed:
veryangrymobster@laktek:master...master
https://github.com/veryangrymobster/punch/compare/laktek:master...master

I didn't expect the diff to still have problems when being compared to
your files. To fix it I'll need to delete my fork and start from scratch.
As it's only two lines would you mind copying the changes manually?


Reply to this email directly or view it on GitHub
#118 (comment).

@s-oram
Copy link
Author

s-oram commented Jan 22, 2015

Alright, I'll give it a go. Thanks Laktek.

@s-oram s-oram closed this Jan 22, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants