Git 1.7 and git push?
 

I saw that there is a change in the way git push works in 1.7.
Currently I only do simple things and a typical workflow is:
git pull
Make a few changes
git commit -a
git push

This normally does a fast forward update and avoids a merge.
Is there another way I should be doing this? Does the answer change for 1.7?
--
devel mailing list
devel@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/devel

Git 1.7 and git push?
 

Le 15/02/2010 17:37, Bruno Wolff III a écrit :
> I saw that there is a change in the way git push works in 1.7.
> Currently I only do simple things and a typical workflow is:
> git pull
> Make a few changes
> git commit -a
> git push
>
> This normally does a fast forward update and avoids a merge.
> Is there another way I should be doing this? Does the answer change for 1.7?

Check release notes, you can configure your remote repository to use old
(unsafe) behavior.
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.0.txt
Mercurial has a similar behaviour, they recommend privileging pull over
push operations because of their asymmetric natures.

H.
--
devel mailing list
devel@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/devel

Git 1.7 and git push?
 

On Mon, Feb 15, 2010 at 18:08:37 +0100,
Haïkel Guémar <karlthered@gmail.com> wrote:
> Le 15/02/2010 17:37, Bruno Wolff III a écrit :
> > I saw that there is a change in the way git push works in 1.7.
> > Currently I only do simple things and a typical workflow is:
> > git pull
> > Make a few changes
> > git commit -a
> > git push
> >
> > This normally does a fast forward update and avoids a merge.
> > Is there another way I should be doing this? Does the answer change for 1.7?
>
> Check release notes, you can configure your remote repository to use old
> (unsafe) behavior.
> http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.0.txt
> Mercurial has a similar behaviour, they recommend privileging pull over
> push operations because of their asymmetric natures.

I don't control the remote repository. That would be fedorahosted in the
case I am asking about.
--
devel mailing list
devel@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/devel

Git 1.7 and git push?
 

On 15 February 2010 17:38, Bruno Wolff III <bruno@wolff.to> wrote:
> On Mon, Feb 15, 2010 at 18:08:37 +0100,
> *Haïkel Guémar <karlthered@gmail.com> wrote:
>> Le 15/02/2010 17:37, Bruno Wolff III a écrit :
>> > I saw that there is a change in the way git push works in 1.7.
>> > Currently I only do simple things and a typical workflow is:
>> > git pull
>> > Make a few changes
>> > git commit -a
>> > git push
>> >
>> > This normally does a fast forward update and avoids a merge.
>> > Is there another way I should be doing this? Does the answer change for 1.7?
>>
>> Check release notes, you can configure your remote repository to use old
>> (unsafe) behavior.
>> http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.0.txt
>> Mercurial has a similar behaviour, they recommend privileging pull over
>> push operations because of their asymmetric natures.
>
> I don't control the remote repository. That would be fedorahosted in the
> case I am asking about.

Presumably you can push to a remote branch on the remote repository
(fedorahosted), and then merge on fedorahosted? Locally you'd set this
up by doing something like:

git config remote.origin.push master:refs/remotes/bruno/master

and then on fedorahosted do git merge remotes/bruno/master

(and similarly for any other local branches).

HTH,
J.
--
devel mailing list
devel@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/devel

Git 1.7 and git push?
 

On Mon, Feb 15, 2010 at 11:38:40AM -0600, Bruno Wolff III wrote:

> I don't control the remote repository. That would be fedorahosted in the
> case I am asking about.

I am pretty sure that the repositories on fedorahosted are bare so that
the changes here do not apply or maybe only apply if you want to remove the
master branch remotely:
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.0.txt

Regards
Till
--
devel mailing list
devel@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/devel

Git 1.7 and git push?
 

Till Maas wrote:
> On Mon, Feb 15, 2010 at 11:38:40AM -0600, Bruno Wolff III wrote:
>
>> I don't control the remote repository. That would be fedorahosted
>> in the case I am asking about.
>
> I am pretty sure that the repositories on fedorahosted are bare so
> that the changes here do not apply or maybe only apply if you want
> to remove the master branch remotely:
> http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.0.txt

I believe that sums it up. It doesn't affect typical git push
behavior. The goal was to alleviate a common issue people run into
when trying to push into non-bare repositories. It came up often
enough in #git on freenode that it became a FAQ. So now if folks want
to push into non-bare repositories, they have to pass the "I've read
the documentation and explicitly enabled it" test.

--
Todd OpenPGP -> KeyID: 0xBEAF0CE3 | URL: www.pobox.com/~tmz/pgp
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~
Liberty is always dangerous, but it is the safest thing we have.
-- Harry Emerson Fosdick

--
devel mailing list
devel@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/devel