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 9C4FD431FBC for ; Mon, 11 Feb 2013 09:51:46 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] 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 yQotI+JKQiSv for ; Mon, 11 Feb 2013 09:51:45 -0800 (PST) Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) by olra.theworths.org (Postfix) with ESMTP id B686F431FAE for ; Mon, 11 Feb 2013 09:51:45 -0800 (PST) Received: from guru.guru-group.fi (localhost [IPv6:::1]) by guru.guru-group.fi (Postfix) with ESMTP id 0EDA01000CA; Sun, 10 Feb 2013 02:56:23 +0200 (EET) From: Tomi Ollila To: Jani Nikula , notmuch@notmuchmail.org Subject: Re: [PATCH] nmbug: only push master branch on nmbug push In-Reply-To: <1360450140-8439-1-git-send-email-jani@nikula.org> References: <1360450140-8439-1-git-send-email-jani@nikula.org> User-Agent: Notmuch/0.15+20~g7e29ae9 (http://notmuchmail.org) Emacs/24.2.1 (x86_64-unknown-linux-gnu) X-Face: HhBM'cA~ MIME-Version: 1.0 Content-Type: text/plain 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: Mon, 11 Feb 2013 17:51:46 -0000 On Sun, Feb 10 2013, Jani Nikula wrote: > 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. > --- LGTM. Tomi > 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 > > _______________________________________________ > notmuch mailing list > notmuch@notmuchmail.org > http://notmuchmail.org/mailman/listinfo/notmuch