Re: [PATCH v2 1/1] rebase.c: make sure current branch isn't moved when autostashing

2019-08-20 Thread Junio C Hamano
Ben Wijen writes: > Consider the following scenario: > git checkout not-the-master > work work work > git rebase --autostash upstream master > > Here 'rebase --autostash ' incorrectly moves the > upstream branch to master. > > The expected behavior: (58794775:/git-rebase.sh:526) >

Re: [PATCH v2 1/1] rebase.c: make sure current branch isn't moved when autostashing

2019-08-20 Thread Eric Sunshine
On Tue, Aug 20, 2019 at 4:12 PM Ben Wijen wrote: > diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh > @@ -306,4 +302,13 @@ test_expect_success 'branch is left alone when possible' > ' > +test_expect_success 'never change upstream branch' ' > + test_when_finished "git r

[PATCH v2 1/1] rebase.c: make sure current branch isn't moved when autostashing

2019-08-20 Thread Ben Wijen
Consider the following scenario: git checkout not-the-master work work work git rebase --autostash upstream master Here 'rebase --autostash ' incorrectly moves the upstream branch to master. The expected behavior: (58794775:/git-rebase.sh:526) AUTOSTASH=$(git stash create autosta