Re: [PATCH v5 1/2] rebase: use test_commit helper in setup
"John Cai via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 15 quoted lines
> From: John Cai <johncai86@gmail.com>
>
> To prepare for the next commit that will test rebase with oids instead
> of branch names, update the rebase setup test to add a couple of tags we
> can use. This uses the test_commit helper so we can replace some lines
> that add a commit manually.
>
> Setting logAllRefUpdates is not necessary because it's on by default for
> repositories with a working tree.
>
> Helped-by: Phillip Wood <phillip.wood123@gmail.com>
> Signed-off-by: John Cai <johncai86@gmail.com>
> ---
> t/t3400-rebase.sh | 9 ++-------
> 1 file changed, 2 insertions(+), 7 deletions(-)
Looks much simpler and obviously correct ;-)
Show 27 quoted lines
> diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
> index 71b1735e1dd..0643d015255 100755
> --- a/t/t3400-rebase.sh
> +++ b/t/t3400-rebase.sh
> @@ -18,10 +18,7 @@ GIT_AUTHOR_EMAIL=bogus@email@address
> export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL
>
> test_expect_success 'prepare repository with topic branches' '
> - git config core.logAllRefUpdates true &&
> - echo First >A &&
> - git update-index --add A &&
> - git commit -m "Add A." &&
> + test_commit "Add A." A First First &&
> git checkout -b force-3way &&
> echo Dummy >Y &&
> git update-index --add Y &&
> @@ -32,9 +29,7 @@ test_expect_success 'prepare repository with topic branches' '
> git mv A D/A &&
> git commit -m "Move A." &&
> git checkout -b my-topic-branch main &&
> - echo Second >B &&
> - git update-index --add B &&
> - git commit -m "Add B." &&
> + test_commit "Add B." B Second Second &&
> git checkout -f main &&
> echo Third >>A &&
> git update-index A &&
Junio C Hamano <gitster@pobox.com>