Re: [PATCH 0/2] git rebase: Make sure upstream branch is left alone.

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 19, 2019, 18:21 UTC
Message-ID: <xmqqef1hxbhg.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <81b244b9-8b26-e638-56ae-827bbc522dc2@wijen.net>

Ben <ben@wijen.net> writes:

Show 18 quoted lines

> Hi Phillip,
>
> The expected behavior: (as per v2.21.0:/git-legacy-rebase.sh:679)
>     AUTOSTASH=$(git stash create autostash)
>     git reset --hard
>     git checkout master
>     git rebase upstream
>     git stash apply $AUTOSTASH 
>
>
> The actual behavior:
>     AUTOSTASH=$(git stash create autostash)
>     git reset --hard master
>     git checkout master
>     git rebase upstream
>     git stash apply $AUTOSTASH 
>
> So, the problem with the actual behavior is the move of the currently active branch with 'git reset --hard master'

Your expected and actual behaviour are described above, but it is not mentioned out of what command (and in what settings) you expect the above behaviour.

I am guessing that the setup and the command is something along this line?

    git checkout not-the-master
    work work work
    git rebase --autostash upstream master

That is, you have checked out a branch that is not the 'master' branch, you have accumulated some work in the working tree, and then you ask "please stash away the work in progress and then rebase the 'master' branch on top of the upstream branch"?

If so, my expectation for the third step (i.e. the actual "rebase") aligns with yours. After stashing away the local change, we want to get a clean working tree, checkout the master branch and rebase it on top of the upstream. With the command sequence you wrote in the "actual" section, after stashing away the local change, the current branch that is *not* the master is reset to the tip of 'master', which would not be what we want.