Use master instead of gh-pages

[klmr]

Currently, the upstream branch name gh-pages is hard-coded. However, when using Github user pages (rather than project pages), Github requires the website to be in the master branch, and there doesn’t seem to be a way of changing this configuration.

Would it be possible for jgd to detect whether it needs to push to gh-pages or to master?

[yegor256]

@klmr yes, this is definitely a good idea. Let me try to implement it...

[yegor256]

@rultor release, tag is 1.7

[rultor]

@rultor release, tag is 1.7

@yegor256 OK, I will release it now. Please check the progress here

[rultor]

@rultor release, tag is 1.7

@klmr @yegor256 Oops, I failed. You can see the full log here (spent 1min)

+ echo -e '\nPreparing  branch:'

Preparing  branch:
++ git branch -a
++ grep origin/
+ '[' -z '  remotes/origin/HEAD -> origin/master
  remotes/origin/master' ']'
+ git checkout ''
+ echo -e '\nDeploying into  branch:'
+ rm -rf test.html

Deploying into  branch:
+ cp -R /tmp/jgd-x7o/_site/test.html .
+ rm -f README.md
+ git add .
++ date
+ git commit -am 'new version Thu Dec 10 10:51:30 UTC 2015' --allow-empty
[master 5a57fe2] new version Thu Dec 10 10:51:30 UTC 2015
+ git push origin
+ sed 's|/tmp/jgd-bXUq|[skipped]|g'
warning: push.default is unset; its implicit value has changed in
Git 2.0 from 'matching' to 'simple'. To squelch this message
and maintain the traditional behavior, use:

  git config --global push.default matching

To squelch this message and adopt the new behavior now, use:

  git config --global push.default simple

When push.default is set to 'matching', git will push local branches
to the remote branches that already exist with the same name.

Since Git 2.0, Git defaults to the more conservative 'simple'
behavior, which only pushes the current branch to the corresponding
remote branch that 'git pull' uses to update the current branch.

See 'git help config' and search for 'push.default' for further information.
(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode
'current' instead of 'simple' if you sometimes use older versions of Git)

remote: error: refusing to update checked out branch: refs/heads/master        
remote: error: By default, updating the current branch in a non-bare repository        
remote: error: is denied, because it will make the index and work tree inconsistent        
remote: error: with what you pushed, and will require 'git reset --hard' to match        
remote: error: the work tree to HEAD.        
remote: error:         
remote: error: You can set 'receive.denyCurrentBranch' configuration variable to        
remote: error: 'ignore' or 'warn' in the remote repository to allow pushing into        
remote: error: its current branch; however, this is not recommended unless you        
remote: error: arranged to update its work tree to match what you pushed in some        
remote: error: other way.        
remote: error:         
remote: error: To squelch this message and still keep the default behaviour, set        
remote: error: 'receive.denyCurrentBranch' configuration variable to 'refuse'.        
To [skipped]
 ! [remote rejected] master -> master (branch is currently checked out)
error: failed to push some refs to '[skipped]'
+ rm -rf /tmp/jgd-x7o

[yegor256]

@rultor release, tag is 1.7

[rultor]

@rultor release, tag is 1.7

@yegor256 OK, I will release it now. Please check the progress here

[rultor]

@rultor release, tag is 1.7

@klmr @yegor256 Oops, I failed. You can see the full log here (spent 1min)

+ echo -e '\nPreparing  branch:'

Preparing  branch:
++ git branch -a
++ grep origin/
+ '[' -z '  remotes/origin/HEAD -> origin/master
  remotes/origin/master' ']'
+ git checkout ''
+ echo -e '\nDeploying into  branch:'

Deploying into  branch:
+ rm -rf test.html
+ cp -R /tmp/jgd-KrF/_site/test.html .
+ rm -f README.md
+ git add .
++ date
+ git commit -am 'new version Thu Dec 10 10:56:59 UTC 2015' --allow-empty
[master 9561151] new version Thu Dec 10 10:56:59 UTC 2015
+ git push origin
+ sed 's|/tmp/jgd-BXqo|[skipped]|g'
warning: push.default is unset; its implicit value has changed in
Git 2.0 from 'matching' to 'simple'. To squelch this message
and maintain the traditional behavior, use:

  git config --global push.default matching

To squelch this message and adopt the new behavior now, use:

  git config --global push.default simple

When push.default is set to 'matching', git will push local branches
to the remote branches that already exist with the same name.

Since Git 2.0, Git defaults to the more conservative 'simple'
behavior, which only pushes the current branch to the corresponding
remote branch that 'git pull' uses to update the current branch.

See 'git help config' and search for 'push.default' for further information.
(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode
'current' instead of 'simple' if you sometimes use older versions of Git)

remote: error: refusing to update checked out branch: refs/heads/master        
remote: error: By default, updating the current branch in a non-bare repository        
remote: error: is denied, because it will make the index and work tree inconsistent        
remote: error: with what you pushed, and will require 'git reset --hard' to match        
remote: error: the work tree to HEAD.        
remote: error:         
remote: error: You can set 'receive.denyCurrentBranch' configuration variable to        
remote: error: 'ignore' or 'warn' in the remote repository to allow pushing into        
remote: error: its current branch; however, this is not recommended unless you        
remote: error: arranged to update its work tree to match what you pushed in some        
remote: error: other way.        
remote: error:         
remote: error: To squelch this message and still keep the default behaviour, set        
remote: error: 'receive.denyCurrentBranch' configuration variable to 'refuse'.        
To [skipped]
 ! [remote rejected] master -> master (branch is currently checked out)
error: failed to push some refs to '[skipped]'
+ rm -rf /tmp/jgd-KrF

[yegor256]

@rultor release, tag is 1.7

[rultor]

@rultor release, tag is 1.7

@yegor256 OK, I will release it now. Please check the progress here

[rultor]

@rultor release, tag is 1.7

@yegor256 Done! FYI, the full log is here (took me 1min)