Fix issue 187

[peloy]

Fix for #187 -- return HTML page instead of HTML code.

[hollie]

Hello Eloy,

thanks for the fix.

I think this pull request accidentily also contains other changes not related to fixing #187. The version number and update to the README.md originates from the v2.200 release branch and does not belong in master IMHO.

Would it be OK if I only merge the relevant changes?

[peloy]

Hi Lieven,

On 05/16/2013 03:04 AM, Lieven Hollevoet wrote:

Hello Eloy,

thanks for the fix.

I think this pull request accidentily also contains other changes not
related to fixing #187
#187.

Yes, I noticed that after I submitted the pull request. I think what
happened is that I accidentally branched from the stable branch instead
of the master branch, though I am not 100% sure.

I am still getting my feet wet with Git so I followed the instructions
at https://github.com/hollie/misterhouse/wiki/Contributing, and I think
there's a missing step that indicates that one should select the master
branch when forking. Otherwise, I think, the branch you'll be in after
cloning is the stable branch. Could this explain what happened to me
with my fix_issue_187 branch and the corresponding pull request?

The version number and update to the README.md originates from the
v2.200 release branch and does not belong in master IMHO.

Absolutely, these changes do not belong in the master branch at all.

Would it be OK if I only merge the relevant changes?

Yes please, of course! Thanks for helping me with this.

Cheers,

Eloy Paris.-

[peloy]

On 05/16/2013 03:26 AM, Eloy Paris wrote:

[...]

Yes, I noticed that after I submitted the pull request. I think what
happened is that I accidentally branched from the stable branch instead
of the master branch, though I am not 100% sure.

I am still getting my feet wet with Git so I followed the instructions
at https://github.com/hollie/misterhouse/wiki/Contributing, and I think
there's a missing step that indicates that one should select the master
branch when forking. Otherwise, I think, the branch you'll be in after
cloning is the stable branch. Could this explain what happened to me
with my fix_issue_187 branch and the corresponding pull request?

Upon checking the brances in my local repository I see that HEAD points
to the stable branch:

peloy@altamira[0]:~/src/misterhouse/misterhouse-peloy$ git branch -r
origin/HEAD -> origin/stable
origin/add_philips_hue_support
origin/add_tts_mac_say
origin/autoversion
origin/fix_issue_187
origin/master
origin/stable

Searching online took me to these two places:

http://stackoverflow.com/questions/354312/why-is-origin-head-shown-when-running-git-branch-r

https://github.com/blog/421-pick-your-default-branch

I have now changed the default branch of my Github repository to point
to the master branch. The previous setting (the stable branch) is what
caused the problem.

It'd be good to update
https://github.com/hollie/misterhouse/wiki/Contributing to make it clear
that new contributors should make sure that their default branch is
master, and not something else. I think the default branch is selected
when the repository is forked, but I am not sure how that is done.
Perhaps one must be browsing the master branch? If not done at
repository fork time then it must be done by visiting the repository
settings, i.e. https://github.com//misterhouse/settings.

Cheers,

Eloy Paris.-

[hollie]

Hey Eloy,

At some point in the past I modified the default branch for the git repo to
the stable one so that users get pointed to the stable one by default.

So when you checkout you get stable by default and you need to checkout
master yourself. I will update the docs accordingly tonight.

Kind regards,
Lieven
Op 16 mei 2013 16:36 schreef "Eloy Paris" notifications@github.com het
volgende:

On 05/16/2013 03:26 AM, Eloy Paris wrote:

[...]

Yes, I noticed that after I submitted the pull request. I think what
happened is that I accidentally branched from the stable branch instead
of the master branch, though I am not 100% sure.

I am still getting my feet wet with Git so I followed the instructions
at https://github.com/hollie/misterhouse/wiki/Contributing, and I think
there's a missing step that indicates that one should select the master
branch when forking. Otherwise, I think, the branch you'll be in after
cloning is the stable branch. Could this explain what happened to me
with my fix_issue_187 branch and the corresponding pull request?

Upon checking the brances in my local repository I see that HEAD points
to the stable branch:

peloy@altamira[0]:~/src/misterhouse/misterhouse-peloy$ git branch -r
origin/HEAD -> origin/stable
origin/add_philips_hue_support
origin/add_tts_mac_say
origin/autoversion
origin/fix_issue_187
origin/master
origin/stable

Searching online took me to these two places:

http://stackoverflow.com/questions/354312/why-is-origin-head-shown-when-running-git-branch-r

https://github.com/blog/421-pick-your-default-branch

I have now changed the default branch of my Github repository to point
to the master branch. The previous setting (the stable branch) is what
caused the problem.

It'd be good to update
https://github.com/hollie/misterhouse/wiki/Contributing to make it clear
that new contributors should make sure that their default branch is
master, and not something else. I think the default branch is selected
when the repository is forked, but I am not sure how that is done.
Perhaps one must be browsing the master branch? If not done at
repository fork time then it must be done by visiting the repository
settings, i.e. https://github.com//misterhouse/settings.

Cheers,

Eloy Paris.-

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/188#issuecomment-18004918
.

[peloy]

On 05/16/2013 10:56 AM, Lieven Hollevoet wrote:

Hey Eloy,

At some point in the past I modified the default branch for the git repo to
the stable one so that users get pointed to the stable one by default.

Ah okay. I understand now what happened.

So when you checkout you get stable by default and you need to checkout
master yourself. I will update the docs accordingly tonight.

Sounds good; thanks! This will prevent confusions for new contributors
in the future.

Cheers,

Eloy Paris.-

[hollie]

Hi Eloy,

The docs are updated, and I have merged your pull request with the following commands (starting from a clean clone):

        541  git clone git@github.com:hollie/misterhouse.git
        542  cd misterhouse/
        543  git checkout -b master origin/master
        544  git remote add peloy git://github.com/peloy/misterhouse.git
        545  git fetch peloy
        546  git cherry-pick dc7ba17492f03342fcfb64daa8e30662372e23ad
        547  git status
        548  git push origin master

Sorry it took a bit longer than 'tonight'. :-)

[peloy]

On 05/20/2013 06:29 AM, Lieven Hollevoet wrote:

Hi Eloy,

The docs are updated, and I have merged your pull request with the
following commands (starting from a clean clone):

| 541 git clone git@github.com:hollie/misterhouse.git
542 cd misterhouse/
543 git checkout -b master origin/master
544 git remote add peloy git://github.com/peloy/misterhouse.git
545 git fetch peloy
546 git cherry-pick dc7ba17
547 git status
548 git push origin master
|

Sorry it took a bit longer than 'tonight'. :-)

Not a problem at all!

Thanks for merging. I'm getting the hang of it so hopefully next time I
won't make a mistake and it'll be easier for you or anyone else to merge
something from me.

Have a great week.

Cheers,

Eloy Paris.-