From: Jani Nikula <jani@nikula.org>
Date: Sat, 9 Feb 2013 22:49:00 +0000 (+0200)
Subject: nmbug: only push master branch on nmbug push
X-Git-Tag: 0.16_rc1~216
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=a03769db17fe5e2ff15a27391086387d1bfe37e7;ds=sidebyside

nmbug: only push master branch on nmbug push

nmbug pull only merges upstream master, but nmbug push tries to push
all local branches. The asymmetry results in conflicts whenever there
have been changes in the config branch in the origin:

$ nmbug push
To nmbug@nmbug.tethera.net:nmbug-tags
 ! [rejected]        config -> config (non-fast-forward)
error: failed to push some refs to 'nmbug@nmbug.tethera.net:nmbug-tags'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. If you did not intend to push that branch, you may want to
hint: specify branches to push or set the 'push.default' configuration
hint: variable to 'current' or 'upstream' to push only the current branch.
'git push origin' exited with nonzero value

To fix this, only push the master branch on nmbug push. Any config
changes need to be done manually via git anyway.
---

diff --git a/contrib/nmbug/nmbug b/contrib/nmbug/nmbug
index f003ef9e..fe103b3b 100755
--- a/contrib/nmbug/nmbug
+++ b/contrib/nmbug/nmbug
@@ -331,7 +331,7 @@ sub do_log {
 sub do_push {
   my $remote = shift || 'origin';
 
-  git ('push', $remote);
+  git ('push', $remote, 'master');
 }