search

laktek / punch

A fun and easy way to build modern websites
http://laktek.github.com/punch
MIT License
1.17k stars 107 forks source link

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

Closed s-oram closed 9 years ago

s-oram commented 9 years ago

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: https://github.com/laktek/punch/issues/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 commented 9 years ago

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 commented 9 years ago

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 commented 9 years ago

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 notifications@github.com 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 https://github.com/laktek/punch/pull/118#issuecomment-70952714.

s-oram commented 9 years ago

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