Re: [PATCH 0/6] Introduce publish tracking branch

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Sep 2, 2013, 07:38 UTC
Message-ID: <CAMP44s3cv9NmOXvdaF+iQgN03Q51rQ-WUJUrf+22U1AFFZKwbQ@mail.gmail.com>
In-Reply-To: <vpq1u57n0rw.fsf@anie.imag.fr>

On Mon, Sep 2, 2013 at 2:25 AM, Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> wrote:

> Felipe Contreras <felipe.contreras@gmail.com> writes:

Show 5 quoted lines

>> As it has been discussed before, our support for triangular workflows is
>> lacking, and the following patch series aims to improve that situation.
>
> I may be stating the obvious, but isn't your series a duplicate of
> remote.pushDefault, introduced in 1.8.3?

How can you currently do this in v1.8.3?

% git push --set-publish github master % git push --set-publish backup test feature-a

% git branch -vv
  master     xxxxx [origin/master, github/master] foo
  test       xxxxx [master, backup/test: ahead 2] foo
  feature-a  xxxxx [master, backup/feature-a] foo

% git checkout master % git rebase # onto origin/master % git push # to github/master

% git checkout feature-a % git rebase # onto master % git push --force # to backup/feature-a

% git checkout test % git branch --set-publish github/my-test % git push # to github/my-test

remote.pushDefault doesn't let you do any of that stuff. Maybe if you only push to one remote, and all the branches have the same names, and you don't need to keep track of them (with git branch -vv). In other words, there's just no comparison.

-- 
Felipe Contreras