Re: [PATCH] nmbug: only push master branch on nmbug push

diff --git a/89/70bb39831750f985a14f6ac80d7de889cc3dc0 b/89/70bb39831750f985a14f6ac80d7de889cc3dc0
new file mode 100644 (file)
index 0000000..f113467
--- /dev/null
+++ b/89/70bb39831750f985a14f6ac80d7de889cc3dc0
@@ -0,0 +1,97 @@
+Return-Path: <tomi.ollila@iki.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 9C4FD431FBC\r
+       for <notmuch@notmuchmail.org>; Mon, 11 Feb 2013 09:51:46 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id yQotI+JKQiSv for <notmuch@notmuchmail.org>;\r
+       Mon, 11 Feb 2013 09:51:45 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id B686F431FAE\r
+       for <notmuch@notmuchmail.org>; Mon, 11 Feb 2013 09:51:45 -0800 (PST)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 0EDA01000CA;\r
+       Sun, 10 Feb 2013 02:56:23 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] nmbug: only push master branch on nmbug push\r
+In-Reply-To: <1360450140-8439-1-git-send-email-jani@nikula.org>\r
+References: <1360450140-8439-1-git-send-email-jani@nikula.org>\r
+User-Agent: Notmuch/0.15+20~g7e29ae9 (http://notmuchmail.org) Emacs/24.2.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Sun, 10 Feb 2013 02:56:22 +0200\r
+Message-ID: <m2liaxdm15.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 11 Feb 2013 17:51:46 -0000\r
+\r
+On Sun, Feb 10 2013, Jani Nikula <jani@nikula.org> wrote:\r
+\r
+> nmbug pull only merges upstream master, but nmbug push tries to push\r
+> all local branches. The asymmetry results in conflicts whenever there\r
+> have been changes in the config branch in the origin:\r
+>\r
+> $ nmbug push\r
+> To nmbug@nmbug.tethera.net:nmbug-tags\r
+>  ! [rejected]        config -> config (non-fast-forward)\r
+> error: failed to push some refs to 'nmbug@nmbug.tethera.net:nmbug-tags'\r
+> hint: Updates were rejected because a pushed branch tip is behind its remote\r
+> hint: counterpart. If you did not intend to push that branch, you may want to\r
+> hint: specify branches to push or set the 'push.default' configuration\r
+> hint: variable to 'current' or 'upstream' to push only the current branch.\r
+> 'git push origin' exited with nonzero value\r
+>\r
+> To fix this, only push the master branch on nmbug push. Any config\r
+> changes need to be done manually via git anyway.\r
+> ---\r
+\r
+LGTM.\r
+\r
+Tomi\r
+\r
+>  contrib/nmbug/nmbug |    2 +-\r
+>  1 file changed, 1 insertion(+), 1 deletion(-)\r
+>\r
+> diff --git a/contrib/nmbug/nmbug b/contrib/nmbug/nmbug\r
+> index f003ef9..fe103b3 100755\r
+> --- a/contrib/nmbug/nmbug\r
+> +++ b/contrib/nmbug/nmbug\r
+> @@ -331,7 +331,7 @@ sub do_log {\r
+>  sub do_push {\r
+>    my $remote = shift || 'origin';\r
+>  \r
+> -  git ('push', $remote);\r
+> +  git ('push', $remote, 'master');\r
+>  }\r
+>  \r
+>  \r
+> -- \r
+> 1.7.10.4\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r