Hi Junio,
On Sun, Apr 21, 2019 at 01:11:18AM -0700, Denton Liu wrote:
> Signed-off-by: Denton Liu <[email protected]>
> ---
> t/t3431-rebase-fork-point.sh | 53 ++++++++++++++++++++++++++++++++++++
> 1 file changed, 53 insertions(+)
> create mode 100755 t/t3431-rebase-fork-point.sh
>
> diff --git a/t/t3431-rebase-fork-point.sh b/t/t3431-rebase-fork-point.sh
> new file mode 100755
> index 0000000000..9b517d87a3
> --- /dev/null
> +++ b/t/t3431-rebase-fork-point.sh
> @@ -0,0 +1,53 @@
> +#!/bin/sh
> +#
> +# Copyright (c) 2019 Denton Liu
> +#
> +
> +test_description='git rebase --fork-point test'
> +
> +. ./test-lib.sh
> +
> +# A---B---D---E (master)
> +# \
> +# C*---F---G (side)
> +#
> +# C was formerly part of master but master was rewound to remove C
> +#
> +test_expect_success setup '
> + test_commit A &&
> + test_commit B &&
> + test_commit C &&
> + git branch -t side &&
> + git reset --hard HEAD^ &&
> + test_commit D &&
> + test_commit E &&
> + git checkout side &&
> + test_commit F &&
> + test_commit G
> +'
> +
> +test_rebase() {
I read in an email thread earlier that the preferred style for function
definitions is to include a space after the name. Sorry for not catching
this earlier.
Could you please change this to `test_rebase () {` for me?
Also, same comment applies to `test_rebase_same_head` in 2/6.
Thanks so much,
Denton
> + expected="$1" &&
> + shift &&
> + test_expect_success "git rebase $*" "
> + git checkout master &&
> + git reset --hard E &&
> + git checkout side &&
> + git reset --hard G &&
> + git rebase $* &&
> + test_write_lines $expected >expect &&
> + git log --pretty=%s >actual &&
> + test_cmp expect actual
> + "
> +}
> +
> +test_rebase 'G F E D B A'
> +test_rebase 'G F D B A' --onto D
> +test_rebase 'G F C E D B A' --no-fork-point
> +test_rebase 'G F C D B A' --no-fork-point --onto D
> +test_rebase 'G F E D B A' --fork-point refs/heads/master
> +test_rebase 'G F D B A' --fork-point --onto D refs/heads/master
> +test_rebase 'G F C E D B A' refs/heads/master
> +test_rebase 'G F C D B A' --onto D refs/heads/master
> +
> +test_done
> --
> 2.21.0.967.gf85e14fd49
>
