Re: [PATCH 2/3] pull --rebase: Add support for rebased default upstream

From: Santi Béjar <santi@agolina.net>
Date: Jun 6, 2009, 08:00 UTC
Message-ID: <adf1fd3d0906060100vc04032eh6315d336ef619402@mail.gmail.com>
In-Reply-To: <alpine.DEB.1.00.0906060120140.26154@pacific.mpi-cbg.de>

2009/6/6 Johannes Schindelin <Johannes.Schindelin@gmx.de>:

Show 15 quoted lines

> Hi,
>
> On Fri, 5 Jun 2009, Santi Béjar wrote:
>
>> Also add a test to check for this case and another one (failing) to
>> test rebasing two branches on top of a rebased upstream using just
>> 'git pull --rebase'.
>>
>> Signed-off-by: Santi Béjar <santi@agolina.net>
>
> Either I am a stupid moron (which is a completely valid suggestion) or
> this commit message lacks in detail severely.
>
> For example, when I "git pull --rebase junio next" and "next" was rebased,
> it works _perfectly_, so I do not see any need for a fix.

It is for the default upstream (with no arguments), so before this patch:

git pull --rebase

did not work with a rebased upstream.

But you are right, the commit message can be improved a lot. I've redone this patch series so much that at the end the commit message lack details.

Show 9 quoted lines

>
> Further, this:
>
>> ---
>>  git-parse-remote.sh |    8 +++++++-
>>  t/t5520-pull.sh     |   29 +++++++++++++++++++++++++++++
>>  2 files changed, 36 insertions(+), 1 deletions(-)
>
> ... suggests to me that pull --rebase is not even affected by your patch.

It modifies a function used in git pull --rebase.

> So maybe you want to clarify so much that even stupid morons understand
> what you want to achieve, and how.

OK, I'll try.

parse-remote: support default reflist in get_remote_merge_branch

Expand get_remote_merge_branch to compute the tracking branch to merge when called without arguments (or only the remote name). This allows "git pull --rebase" without arguments (default upstream branch) to work with a rebased upstream.

Santi