From: Jani Nikula Date: Sat, 9 Feb 2013 22:49:00 +0000 (+0200) Subject: [PATCH] nmbug: only push master branch on nmbug push X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c84c755acb8075a75b8c7d0432751ca4bb0cfd24;p=notmuch-archives.git [PATCH] nmbug: only push master branch on nmbug push --- diff --git a/90/3e55f318670c7ed8e4e27bd27e465c2e66af13 b/90/3e55f318670c7ed8e4e27bd27e465c2e66af13 new file mode 100644 index 000000000..e3cd9d778 --- /dev/null +++ b/90/3e55f318670c7ed8e4e27bd27e465c2e66af13 @@ -0,0 +1,100 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 5F21F431FAF + for ; Sat, 9 Feb 2013 14:49:05 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id 6x2nD0sNGNNN for ; + Sat, 9 Feb 2013 14:49:03 -0800 (PST) +Received: from mail-lb0-f174.google.com (mail-lb0-f174.google.com + [209.85.217.174]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id E405C431FAE + for ; Sat, 9 Feb 2013 14:49:02 -0800 (PST) +Received: by mail-lb0-f174.google.com with SMTP id l12so3848105lbo.19 + for ; Sat, 09 Feb 2013 14:49:00 -0800 (PST) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=google.com; s=20120113; + h=x-received:from:to:cc:subject:date:message-id:x-mailer + :x-gm-message-state; + bh=75JwWYVvmnPjPVGJAwDbe+f/vbcDoDcuz7rjnmtUV80=; + b=CYcKl6vpGxheyHH4qlmXTwLjhyZIrkpkkfsEFWO/JEmu36iDN86/ZwD0RfgquZxvzc + JPDaLqdcyRF3r2IP1nX0xpk8Jp2bxq00L899I/a3l+z2NHN4c/1j9/hcesbLs57JqliJ + F8Kxw646bAHvw59oCXL5KRK290pDRwicv/QfgG+3SUyl88H0K4NDfPjaj8mJtPK+lfhJ + HP52jD1xMloNOXwx695y3uutAtauiFc7W8X+etYbmpE9BwNXLAjO+X18qhIkHRHeDkN2 + fhMubgEX4G8H9/gbcmaWct1xcOIYW3FxJOx1A6dIPM5ypNNnVxd+2s30DMN6m+pSjyao + 8Pkw== +X-Received: by 10.152.133.130 with SMTP id pc2mr8611502lab.51.1360450139954; + Sat, 09 Feb 2013 14:48:59 -0800 (PST) +Received: from localhost (dsl-hkibrasgw4-50df51-27.dhcp.inet.fi. + [80.223.81.27]) + by mx.google.com with ESMTPS id fz16sm20582lab.5.2013.02.09.14.48.57 + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Sat, 09 Feb 2013 14:48:58 -0800 (PST) +From: Jani Nikula +To: notmuch@notmuchmail.org +Subject: [PATCH] nmbug: only push master branch on nmbug push +Date: Sun, 10 Feb 2013 00:49:00 +0200 +Message-Id: <1360450140-8439-1-git-send-email-jani@nikula.org> +X-Mailer: git-send-email 1.7.10.4 +X-Gm-Message-State: + ALoCoQnphBfOq7/Rz7V5JjVX1TLRk2XQe1ftH7bSOYa6UfwlPN3ngh78NptJUIIXA9d1j7js4m1f +Cc: Tomi Ollila +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sat, 09 Feb 2013 22:49:05 -0000 + +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. +--- + contrib/nmbug/nmbug | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/contrib/nmbug/nmbug b/contrib/nmbug/nmbug +index f003ef9..fe103b3 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'); + } + + +-- +1.7.10.4 +