From: Tomi Ollila <tomi.ollila@iki.fi>
To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org
Subject: Re: [PATCH] nmbug: only push master branch on nmbug push
Date: Sun, 10 Feb 2013 02:56:22 +0200 [thread overview]
Message-ID: <m2liaxdm15.fsf@guru.guru-group.fi> (raw)
In-Reply-To: <1360450140-8439-1-git-send-email-jani@nikula.org>
On Sun, Feb 10 2013, Jani Nikula <jani@nikula.org> 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
next prev parent reply other threads:[~2013-02-11 17:51 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-09 22:49 [PATCH] nmbug: only push master branch on nmbug push Jani Nikula
2013-02-10 0:56 ` Tomi Ollila [this message]
2013-02-10 1:26 ` David Bremner
2013-02-14 11:58 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m2liaxdm15.fsf@guru.guru-group.fi \
--to=tomi.ollila@iki.fi \
--cc=jani@nikula.org \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).