Phillip Wood <phillip.w...@talktalk.net> writes:

> From: Phillip Wood <phillip.w...@dunelm.org.uk>
>
> Check that the reflog message written to the branch reflog when the
> rebase is completed is correct. This checks for regressions for the
> fix in commit
> 4ab867b8fc rebase -i: fix reflog message
>
> Signed-off-by: Phillip Wood <phillip.w...@dunelm.org.uk>
> ---

Good idea.  Thanks.

>  t/t3404-rebase-interactive.sh | 7 +++++++
>  1 file changed, 7 insertions(+)
>
> diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
> index 
> 5bd0275930b715c25507fc9744c8946e7f73900b..37821d245433f757fa13f0a3e27da0312bebb7db
>  100755
> --- a/t/t3404-rebase-interactive.sh
> +++ b/t/t3404-rebase-interactive.sh
> @@ -169,6 +169,13 @@ test_expect_success 'reflog for the branch shows state 
> before rebase' '
>       test $(git rev-parse branch1@{1}) = $(git rev-parse original-branch1)
>  '
>  
> +test_expect_success 'reflog for the branch shows correct finish message' '
> +     printf "rebase -i (finish): refs/heads/branch1 onto %s\n" \
> +             "$(git rev-parse branch2)" >expected &&
> +     git log -g --pretty=%gs -1 refs/heads/branch1 >actual &&
> +     test_cmp expected actual
> +'
> +
>  test_expect_success 'exchange two commits' '
>       set_fake_editor &&
>       FAKE_LINES="2 1" git rebase -i HEAD~2 &&

Reply via email to