From: Phillip Wood <phillip.wood123@gmail.com>
To: Ben Wijen <ben@wijen.net>, git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Pratik Karki <predatoramigo@gmail.com>
Subject: Re: [PATCH 1/2] t3420: never change upstream branch
Date: Tue, 20 Aug 2019 09:58:28 +0100 [thread overview]
Message-ID: <a8645289-ff60-7739-b010-039583beef1c@gmail.com> (raw)
In-Reply-To: <20190818095349.3218-2-ben@wijen.net>
Hi Ben
On 18/08/2019 10:53, Ben Wijen wrote:
> When using `git rebase --autostash <upstream> <branch>` and
> the workarea is dirty, the active branch is incorrectly reset
> to the rebase <upstream> branch.
>
> This test will check for such behavior.
>
> Signed-off-by: Ben Wijen <ben@wijen.net>
> ---
> t/t3420-rebase-autostash.sh | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh
> index b8f4d03467..867e4e0b17 100755
> --- a/t/t3420-rebase-autostash.sh
> +++ b/t/t3420-rebase-autostash.sh
> @@ -306,4 +306,13 @@ test_expect_success 'branch is left alone when possible' '
> test unchanged-branch = "$(git rev-parse --abbrev-ref HEAD)"
> '
>
> +test_expect_success 'never change upstream branch' '
> + test_when_finished "git reset --hard && git branch -D upstream" &&
> + git checkout -b upstream unrelated-onto-branch &&
> + echo changed >file0 &&
> + git add file0 &&
> + git rebase --autostash upstream feature-branch &&
> + test $(git rev-parse upstream) = $(git rev-parse unrelated-onto-branch)
In addition to Junio's suggestions I'd add using
test_cmp_rev upstream unrelated-onto-branch
for the last line.
Best Wishes
Phillip
> +'
> +
> test_done
>
next prev parent reply other threads:[~2019-08-20 8:58 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-18 9:53 [PATCH 0/2] git rebase: Make sure upstream branch is left alone Ben Wijen
2019-08-18 9:53 ` [PATCH 1/2] t3420: never change upstream branch Ben Wijen
2019-08-19 21:55 ` Junio C Hamano
2019-08-20 8:58 ` Phillip Wood [this message]
2019-08-18 9:53 ` [PATCH 2/2] rebase.c: make sure current branch isn't moved when autostashing Ben Wijen
2019-08-20 9:00 ` Phillip Wood
2019-08-20 19:53 ` Ben
2019-08-20 20:12 ` [PATCH v2 0/1] git rebase: Make sure upstream branch is left alone Ben Wijen
2019-08-20 20:12 ` [PATCH v2 1/1] rebase.c: make sure current branch isn't moved when autostashing Ben Wijen
2019-08-20 20:24 ` Eric Sunshine
2019-08-20 20:58 ` Junio C Hamano
2019-08-21 18:29 ` [PATCH v3 0/1] rebase.c: make sure the active " Ben Wijen
2019-08-21 18:29 ` [PATCH v3 1/1] " Ben Wijen
2019-08-22 12:27 ` Johannes Schindelin
2019-08-22 15:49 ` Junio C Hamano
2019-08-26 16:45 ` [PATCH v4 " Ben Wijen
2019-08-26 16:45 ` Ben Wijen
2019-08-26 17:10 ` SZEDER Gábor
2019-08-28 12:56 ` Johannes Schindelin
2019-08-28 15:34 ` Junio C Hamano
2019-08-28 16:03 ` Junio C Hamano
2019-08-29 16:47 ` [PATCH v5 0/2] rebase.c: make sure current " Ben Wijen
2019-08-29 16:47 ` [PATCH v5 1/2] builtin/rebase.c: make sure the active " Ben Wijen
2019-08-29 16:47 ` [PATCH v5 2/2] builtin/rebase.c: Remove pointless message Ben Wijen
2019-08-30 15:16 ` [PATCH v6 0/2] rebase.c: make sure current branch isn't moved when autostashing Ben Wijen
2019-08-30 15:16 ` [PATCH v6 1/2] builtin/rebase.c: make sure the active " Ben Wijen
2019-08-30 20:15 ` Junio C Hamano
2019-08-31 7:17 ` Ben
2019-09-01 16:01 ` Junio C Hamano
2019-09-01 16:27 ` Ben
2019-09-02 17:33 ` Junio C Hamano
2019-08-30 15:16 ` [PATCH v6 2/2] builtin/rebase.c: Remove pointless message Ben Wijen
2019-08-30 20:16 ` Junio C Hamano
2019-08-31 7:17 ` Ben
2019-08-30 15:16 ` [PATCH " Ben Wijen
2019-08-19 9:26 ` [PATCH 0/2] git rebase: Make sure upstream branch is left alone Phillip Wood
2019-08-19 15:33 ` Ben
2019-08-19 18:21 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a8645289-ff60-7739-b010-039583beef1c@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=ben@wijen.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=phillip.wood@dunelm.org.uk \
--cc=predatoramigo@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).