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

diff --git a/90/3e55f318670c7ed8e4e27bd27e465c2e66af13 b/90/3e55f318670c7ed8e4e27bd27e465c2e66af13
new file mode 100644 (file)
index 0000000..e3cd9d7
--- /dev/null
+++ b/90/3e55f318670c7ed8e4e27bd27e465c2e66af13
@@ -0,0 +1,100 @@
+Return-Path: <jani@nikula.org>\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 5F21F431FAF\r
+       for <notmuch@notmuchmail.org>; Sat,  9 Feb 2013 14:49:05 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 6x2nD0sNGNNN for <notmuch@notmuchmail.org>;\r
+       Sat,  9 Feb 2013 14:49:03 -0800 (PST)\r
+Received: from mail-lb0-f174.google.com (mail-lb0-f174.google.com\r
+       [209.85.217.174]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id E405C431FAE\r
+       for <notmuch@notmuchmail.org>; Sat,  9 Feb 2013 14:49:02 -0800 (PST)\r
+Received: by mail-lb0-f174.google.com with SMTP id l12so3848105lbo.19\r
+       for <notmuch@notmuchmail.org>; Sat, 09 Feb 2013 14:49:00 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=x-received:from:to:cc:subject:date:message-id:x-mailer\r
+       :x-gm-message-state;\r
+       bh=75JwWYVvmnPjPVGJAwDbe+f/vbcDoDcuz7rjnmtUV80=;\r
+       b=CYcKl6vpGxheyHH4qlmXTwLjhyZIrkpkkfsEFWO/JEmu36iDN86/ZwD0RfgquZxvzc\r
+       JPDaLqdcyRF3r2IP1nX0xpk8Jp2bxq00L899I/a3l+z2NHN4c/1j9/hcesbLs57JqliJ\r
+       F8Kxw646bAHvw59oCXL5KRK290pDRwicv/QfgG+3SUyl88H0K4NDfPjaj8mJtPK+lfhJ\r
+       HP52jD1xMloNOXwx695y3uutAtauiFc7W8X+etYbmpE9BwNXLAjO+X18qhIkHRHeDkN2\r
+       fhMubgEX4G8H9/gbcmaWct1xcOIYW3FxJOx1A6dIPM5ypNNnVxd+2s30DMN6m+pSjyao\r
+       8Pkw==\r
+X-Received: by 10.152.133.130 with SMTP id pc2mr8611502lab.51.1360450139954;\r
+       Sat, 09 Feb 2013 14:48:59 -0800 (PST)\r
+Received: from localhost (dsl-hkibrasgw4-50df51-27.dhcp.inet.fi.\r
+       [80.223.81.27])\r
+       by mx.google.com with ESMTPS id fz16sm20582lab.5.2013.02.09.14.48.57\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sat, 09 Feb 2013 14:48:58 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] nmbug: only push master branch on nmbug push\r
+Date: Sun, 10 Feb 2013 00:49:00 +0200\r
+Message-Id: <1360450140-8439-1-git-send-email-jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.10.4\r
+X-Gm-Message-State:\r
+ ALoCoQnphBfOq7/Rz7V5JjVX1TLRk2XQe1ftH7bSOYa6UfwlPN3ngh78NptJUIIXA9d1j7js4m1f\r
+Cc: Tomi Ollila <tomi.ollila@iki.fi>\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: Sat, 09 Feb 2013 22:49:05 -0000\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
+ 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