Allow user values to override drop-determined values

[benbalter]

Via #108 (comment), it appears user-supplied site.github values are being overwritten by drop-supplied values.

It appears in 54942a4#diff-165b64b2f6bce98447b6c550f3205ad9L26, the order of the arguements passed to Jekyll::Utils.deep_merge_hashes were reversed since the right overrides the left value.

This PR adds failing tests via a7d2b4b to ensure site.github is set to the expected value given different user-supplied inputs for site.github with d36d1af reversing the order of the arguments.

/cc @DirtyF

[DirtyF]

@benbalter FWIW I just did a test with this branch and it does still output the drop value from GitHub, not the one from the local config file, even with the switch of the arguments of deep_merge_hashes. 🤔

Here's a link to the build preview, you can see that the link "Editez le contenu" still points to gh-pages.

Happy to help debug you this.

[benbalter]

@DirtyF backported (forward-ported?) jekyll/jekyll#6338 via 7a97ed0. Let me know if things work as expected now?

[parkr]

Flipping this may have some unintended consequences (because people expect the opposite) so we should be prepared for upset users.

[DirtyF]

@benbalter the issue is not resolved in my case{{ site.github.source.branch }} still output gh-pages 😞

Test: DirtyF/frank.taillandier.me@85987a8

[benbalter]

@DirtyF see jekyll/jekyll#6338 (comment). Mind giving it one more try? (I tested locally with a test site and it worked as expected).

[benbalter]

Test: DirtyF/frank.taillandier.me@85987a8

Tested locally and go the following (expected) output:

  <footer>
    <p>Une correction à apporter ? <a href="https://github.com//edit/master/_posts/2017-08-27-securite-psychologique.md">Éditez cet article</a>.</p>
  </footer>

[benbalter]

@jekyllbot: merge +minor.