* Git question: specify branches to push
@ 2014-11-27 10:27 Stephen Berman
2014-11-27 10:30 ` Lars Magne Ingebrigtsen
` (2 more replies)
0 siblings, 3 replies; 14+ messages in thread
From: Stephen Berman @ 2014-11-27 10:27 UTC (permalink / raw)
To: emacs-devel
I've pushed several commits to emacs-24 at Savannah, and each time git
says the following:
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'srb@git.sv.gnu.org:/srv/git/emacs.git'
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 variable
hint: to 'simple', 'current' or 'upstream' to push only the current branch.
Of course I didn't want to push master so it's good it was rejected, but
it would be unpleasant if my master branch happens to be up to date when
I push emacs-24 (or vice versa). But how do I tell git to push only
emacs-24 (or only master)? I tried `git push emacs-24' and `git push
origin/emacs-24' but it didn't recognize either as an existing branch.
Steve Berman
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: Git question: specify branches to push
2014-11-27 10:27 Git question: specify branches to push Stephen Berman
@ 2014-11-27 10:30 ` Lars Magne Ingebrigtsen
2014-11-27 11:15 ` Stephen Berman
2014-11-27 16:19 ` Eli Zaretskii
2014-11-27 10:59 ` Lee Duhem
2014-11-28 10:35 ` Phillip Lord
2 siblings, 2 replies; 14+ messages in thread
From: Lars Magne Ingebrigtsen @ 2014-11-27 10:30 UTC (permalink / raw)
To: Stephen Berman; +Cc: emacs-devel
Stephen Berman <stephen.berman@gmx.net> writes:
> Of course I didn't want to push master so it's good it was rejected, but
> it would be unpleasant if my master branch happens to be up to date when
> I push emacs-24 (or vice versa). But how do I tell git to push only
> emacs-24 (or only master)? I tried `git push emacs-24' and `git push
> origin/emacs-24' but it didn't recognize either as an existing branch.
Say
git config push.default current
to get sane pushing.
--
(domestic pets only, the antidote for overdose, milk.)
bloggy blog: http://lars.ingebrigtsen.no
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: Git question: specify branches to push
2014-11-27 10:30 ` Lars Magne Ingebrigtsen
@ 2014-11-27 11:15 ` Stephen Berman
2014-11-27 16:19 ` Eli Zaretskii
1 sibling, 0 replies; 14+ messages in thread
From: Stephen Berman @ 2014-11-27 11:15 UTC (permalink / raw)
To: Lars Magne Ingebrigtsen; +Cc: Lee Duhem, emacs-devel
On Thu, 27 Nov 2014 11:30:20 +0100 Lars Magne Ingebrigtsen <larsi@gnus.org> wrote:
> Stephen Berman <stephen.berman@gmx.net> writes:
>
>> Of course I didn't want to push master so it's good it was rejected, but
>> it would be unpleasant if my master branch happens to be up to date when
>> I push emacs-24 (or vice versa). But how do I tell git to push only
>> emacs-24 (or only master)? I tried `git push emacs-24' and `git push
>> origin/emacs-24' but it didn't recognize either as an existing branch.
>
> Say
>
> git config push.default current
>
> to get sane pushing.
On Thu, 27 Nov 2014 18:59:13 +0800 Lee Duhem <lee.duhem@gmail.com> wrote:
> git push origin emacs-24
>
> should work.
Thanks to both of you for the advice.
Steve Berman
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: Git question: specify branches to push
2014-11-27 10:30 ` Lars Magne Ingebrigtsen
2014-11-27 11:15 ` Stephen Berman
@ 2014-11-27 16:19 ` Eli Zaretskii
2014-11-27 16:43 ` Lars Magne Ingebrigtsen
1 sibling, 1 reply; 14+ messages in thread
From: Eli Zaretskii @ 2014-11-27 16:19 UTC (permalink / raw)
To: Lars Magne Ingebrigtsen; +Cc: stephen.berman, emacs-devel
> From: Lars Magne Ingebrigtsen <larsi@gnus.org>
> Date: Thu, 27 Nov 2014 11:30:20 +0100
> Cc: emacs-devel@gnu.org
>
> Say
>
> git config push.default current
>
> to get sane pushing.
I use 'simple', not 'current', FWIW. Its advantage (among others) is
that it's the default in Git 2.x.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: Git question: specify branches to push
2014-11-27 16:19 ` Eli Zaretskii
@ 2014-11-27 16:43 ` Lars Magne Ingebrigtsen
2014-11-27 16:45 ` Eli Zaretskii
0 siblings, 1 reply; 14+ messages in thread
From: Lars Magne Ingebrigtsen @ 2014-11-27 16:43 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: stephen.berman, emacs-devel
Eli Zaretskii <eliz@gnu.org> writes:
>> From: Lars Magne Ingebrigtsen <larsi@gnus.org>
>> Date: Thu, 27 Nov 2014 11:30:20 +0100
>> Cc: emacs-devel@gnu.org
>>
>> Say
>>
>> git config push.default current
>>
>> to get sane pushing.
>
> I use 'simple', not 'current', FWIW. Its advantage (among others) is
> that it's the default in Git 2.x.
"simple" is not supported in older versions of git, and it gets the
trick done, so it's, er, simpler to recommend "current".
--
(domestic pets only, the antidote for overdose, milk.)
bloggy blog: http://lars.ingebrigtsen.no
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: Git question: specify branches to push
2014-11-27 16:43 ` Lars Magne Ingebrigtsen
@ 2014-11-27 16:45 ` Eli Zaretskii
2014-11-27 16:53 ` Lars Magne Ingebrigtsen
` (2 more replies)
0 siblings, 3 replies; 14+ messages in thread
From: Eli Zaretskii @ 2014-11-27 16:45 UTC (permalink / raw)
To: Lars Magne Ingebrigtsen; +Cc: stephen.berman, emacs-devel
> From: Lars Magne Ingebrigtsen <larsi@gnus.org>
> Cc: stephen.berman@gmx.net, emacs-devel@gnu.org
> Date: Thu, 27 Nov 2014 17:43:38 +0100
>
> > I use 'simple', not 'current', FWIW. Its advantage (among others) is
> > that it's the default in Git 2.x.
>
> "simple" is not supported in older versions of git
Older than what version?
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: Git question: specify branches to push
2014-11-27 16:45 ` Eli Zaretskii
@ 2014-11-27 16:53 ` Lars Magne Ingebrigtsen
2015-04-18 6:04 ` Steinar Bang
2014-11-27 17:04 ` David Engster
2014-11-27 17:06 ` Andreas Schwab
2 siblings, 1 reply; 14+ messages in thread
From: Lars Magne Ingebrigtsen @ 2014-11-27 16:53 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: stephen.berman, emacs-devel
Eli Zaretskii <eliz@gnu.org> writes:
>> From: Lars Magne Ingebrigtsen <larsi@gnus.org>
>> Cc: stephen.berman@gmx.net, emacs-devel@gnu.org
>> Date: Thu, 27 Nov 2014 17:43:38 +0100
>>
>> > I use 'simple', not 'current', FWIW. Its advantage (among others) is
>> > that it's the default in Git 2.x.
>>
>> "simple" is not supported in older versions of git
>
> Older than what version?
I don't know, but the version of git in Debian Stable does not mention
"simple" in its manual.
--
(domestic pets only, the antidote for overdose, milk.)
bloggy blog: http://lars.ingebrigtsen.no
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: Git question: specify branches to push
2014-11-27 16:53 ` Lars Magne Ingebrigtsen
@ 2015-04-18 6:04 ` Steinar Bang
0 siblings, 0 replies; 14+ messages in thread
From: Steinar Bang @ 2015-04-18 6:04 UTC (permalink / raw)
To: emacs-devel
>>>>> Lars Magne Ingebrigtsen <larsi@gnus.org>:
> Eli Zaretskii <eliz@gnu.org> writes:
>>> From: Lars Magne Ingebrigtsen <larsi@gnus.org>
>>> > I use 'simple', not 'current', FWIW. Its advantage (among others) is
>>> > that it's the default in Git 2.x.
>>> "simple" is not supported in older versions of git
>> Older than what version?
It was introduced in 1.7.11 AFAICG (As Far As I Can Google): http://stackoverflow.com/a/948397
> I don't know, but the version of git in Debian Stable does not mention
> "simple" in its manual.
Debian stable has:
sb@doohan:~$ git --version
git version 1.7.10.4
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: Git question: specify branches to push
2014-11-27 16:45 ` Eli Zaretskii
2014-11-27 16:53 ` Lars Magne Ingebrigtsen
@ 2014-11-27 17:04 ` David Engster
2014-11-27 17:14 ` Eli Zaretskii
2014-11-27 17:06 ` Andreas Schwab
2 siblings, 1 reply; 14+ messages in thread
From: David Engster @ 2014-11-27 17:04 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: Lars Magne Ingebrigtsen, stephen.berman, emacs-devel
Eli Zaretskii writes:
>> From: Lars Magne Ingebrigtsen <larsi@gnus.org>
>> Cc: stephen.berman@gmx.net, emacs-devel@gnu.org
>> Date: Thu, 27 Nov 2014 17:43:38 +0100
>>
>> > I use 'simple', not 'current', FWIW. Its advantage (among others) is
>> > that it's the default in Git 2.x.
>>
>> "simple" is not supported in older versions of git
>
> Older than what version?
1.7.11. (Debian ships with 1.7.10.)
-David
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: Git question: specify branches to push
2014-11-27 17:04 ` David Engster
@ 2014-11-27 17:14 ` Eli Zaretskii
2014-11-27 19:38 ` Stephen Berman
0 siblings, 1 reply; 14+ messages in thread
From: Eli Zaretskii @ 2014-11-27 17:14 UTC (permalink / raw)
To: David Engster; +Cc: larsi, stephen.berman, emacs-devel
> From: David Engster <deng@randomsample.de>
> Cc: Lars Magne Ingebrigtsen <larsi@gnus.org>, stephen.berman@gmx.net, emacs-devel@gnu.org
> Date: Thu, 27 Nov 2014 18:04:49 +0100
>
> Eli Zaretskii writes:
> >> From: Lars Magne Ingebrigtsen <larsi@gnus.org>
> >> Cc: stephen.berman@gmx.net, emacs-devel@gnu.org
> >> Date: Thu, 27 Nov 2014 17:43:38 +0100
> >>
> >> > I use 'simple', not 'current', FWIW. Its advantage (among others) is
> >> > that it's the default in Git 2.x.
> >>
> >> "simple" is not supported in older versions of git
> >
> > Older than what version?
>
> 1.7.11. (Debian ships with 1.7.10.)
Thanks. Of course, the relevant question is what version does Stephen
have.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: Git question: specify branches to push
2014-11-27 17:14 ` Eli Zaretskii
@ 2014-11-27 19:38 ` Stephen Berman
0 siblings, 0 replies; 14+ messages in thread
From: Stephen Berman @ 2014-11-27 19:38 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: larsi, David Engster, emacs-devel
On Thu, 27 Nov 2014 19:14:39 +0200 Eli Zaretskii <eliz@gnu.org> wrote:
>> From: David Engster <deng@randomsample.de>
>> Cc: Lars Magne Ingebrigtsen <larsi@gnus.org>, stephen.berman@gmx.net,
>> emacs-devel@gnu.org
>> Date: Thu, 27 Nov 2014 18:04:49 +0100
>>
>> Eli Zaretskii writes:
>> >> From: Lars Magne Ingebrigtsen <larsi@gnus.org>
>> >> Cc: stephen.berman@gmx.net, emacs-devel@gnu.org
>> >> Date: Thu, 27 Nov 2014 17:43:38 +0100
>> >>
>> >> > I use 'simple', not 'current', FWIW. Its advantage (among others) is
>> >> > that it's the default in Git 2.x.
>> >>
>> >> "simple" is not supported in older versions of git
>> >
>> > Older than what version?
>>
>> 1.7.11. (Debian ships with 1.7.10.)
>
> Thanks. Of course, the relevant question is what version does Stephen
> have.
git version 1.8.4.5
Steve Berman
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: Git question: specify branches to push
2014-11-27 16:45 ` Eli Zaretskii
2014-11-27 16:53 ` Lars Magne Ingebrigtsen
2014-11-27 17:04 ` David Engster
@ 2014-11-27 17:06 ` Andreas Schwab
2 siblings, 0 replies; 14+ messages in thread
From: Andreas Schwab @ 2014-11-27 17:06 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: Lars Magne Ingebrigtsen, stephen.berman, emacs-devel
Eli Zaretskii <eliz@gnu.org> writes:
>> From: Lars Magne Ingebrigtsen <larsi@gnus.org>
>> Cc: stephen.berman@gmx.net, emacs-devel@gnu.org
>> Date: Thu, 27 Nov 2014 17:43:38 +0100
>>
>> > I use 'simple', not 'current', FWIW. Its advantage (among others) is
>> > that it's the default in Git 2.x.
>>
>> "simple" is not supported in older versions of git
>
> Older than what version?
simple has been added by v1.7.11, release in June 2012.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: Git question: specify branches to push
2014-11-27 10:27 Git question: specify branches to push Stephen Berman
2014-11-27 10:30 ` Lars Magne Ingebrigtsen
@ 2014-11-27 10:59 ` Lee Duhem
2014-11-28 10:35 ` Phillip Lord
2 siblings, 0 replies; 14+ messages in thread
From: Lee Duhem @ 2014-11-27 10:59 UTC (permalink / raw)
To: Stephen Berman; +Cc: Emacs Devel
On Thu, Nov 27, 2014 at 6:27 PM, Stephen Berman <stephen.berman@gmx.net> wrote:
> I've pushed several commits to emacs-24 at Savannah, and each time git
> says the following:
>
> ! [rejected] master -> master (non-fast-forward)
> error: failed to push some refs to 'srb@git.sv.gnu.org:/srv/git/emacs.git'
> 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 variable
> hint: to 'simple', 'current' or 'upstream' to push only the current branch.
>
> Of course I didn't want to push master so it's good it was rejected, but
> it would be unpleasant if my master branch happens to be up to date when
> I push emacs-24 (or vice versa). But how do I tell git to push only
> emacs-24 (or only master)?
git push origin emacs-24
should work.
Sincerely,
lee
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: Git question: specify branches to push
2014-11-27 10:27 Git question: specify branches to push Stephen Berman
2014-11-27 10:30 ` Lars Magne Ingebrigtsen
2014-11-27 10:59 ` Lee Duhem
@ 2014-11-28 10:35 ` Phillip Lord
2 siblings, 0 replies; 14+ messages in thread
From: Phillip Lord @ 2014-11-28 10:35 UTC (permalink / raw)
To: Stephen Berman; +Cc: emacs-devel
Stephen Berman <stephen.berman@gmx.net> writes:
> I've pushed several commits to emacs-24 at Savannah, and each time git
> says the following:
>
> ! [rejected] master -> master (non-fast-forward)
> error: failed to push some refs to 'srb@git.sv.gnu.org:/srv/git/emacs.git'
> 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 variable
> hint: to 'simple', 'current' or 'upstream' to push only the current branch.
>
> Of course I didn't want to push master so it's good it was rejected, but
> it would be unpleasant if my master branch happens to be up to date when
> I push emacs-24 (or vice versa). But how do I tell git to push only
> emacs-24 (or only master)? I tried `git push emacs-24' and `git push
> origin/emacs-24' but it didn't recognize either as an existing branch.
This is the default behaviour for Magit, incidentally. You push and it
pushes the branch that you are on. Underneath, I guess, it's using
tracking branches (which automatically sets upstream branch).
Phil
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2015-04-18 6:04 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-27 10:27 Git question: specify branches to push Stephen Berman
2014-11-27 10:30 ` Lars Magne Ingebrigtsen
2014-11-27 11:15 ` Stephen Berman
2014-11-27 16:19 ` Eli Zaretskii
2014-11-27 16:43 ` Lars Magne Ingebrigtsen
2014-11-27 16:45 ` Eli Zaretskii
2014-11-27 16:53 ` Lars Magne Ingebrigtsen
2015-04-18 6:04 ` Steinar Bang
2014-11-27 17:04 ` David Engster
2014-11-27 17:14 ` Eli Zaretskii
2014-11-27 19:38 ` Stephen Berman
2014-11-27 17:06 ` Andreas Schwab
2014-11-27 10:59 ` Lee Duhem
2014-11-28 10:35 ` Phillip Lord
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.