From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: John Cai via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Phillip Wood <phillip.wood123@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
John Cai <johncai86@gmail.com>
Subject: Re: [PATCH v3 1/2] rebase: use test_commit helper in setup
Date: Thu, 17 Mar 2022 14:37:06 +0100 [thread overview]
Message-ID: <220317.86v8wcd7ig.gmgdl@evledraar.gmail.com> (raw)
In-Reply-To: <f658eb00bcd2429859bc7b0d3b19bfa8a7791ca8.1647487001.git.gitgitgadget@gmail.com>
On Thu, Mar 17 2022, John Cai via GitGitGadget wrote:
> 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(-)
>
> 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 &&
At least these could also be done, and skimming there's a few more "git
commit" that could also be converted:
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index 0643d015255..6dc8df8be7e 100755
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -35,9 +35,7 @@ test_expect_success 'prepare repository with topic branches' '
git update-index A &&
git commit -m "Modify A." &&
git checkout -b side my-topic-branch &&
- echo Side >>C &&
- git add C &&
- git commit -m "Add C" &&
+ test_commit --no-tag "Add C" C Side &&
git checkout -f my-topic-branch &&
git tag topic
'
@@ -114,10 +112,7 @@ test_expect_success 'rebase off of the previous branch using "-"' '
test_expect_success 'rebase a single mode change' '
git checkout main &&
git branch -D topic &&
- echo 1 >X &&
- git add X &&
- test_tick &&
- git commit -m prepare &&
+ test_commit prepare X 1 &&
git checkout -b modechange HEAD^ &&
echo 1 >X &&
git add X &&
Maybe worthwhile squashing in & doing the rest?
Note that --no-tag and --append allow for converting more than could be
in the past before those (relatively recently added) options.
next prev parent reply other threads:[~2022-03-17 13:38 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-11 5:05 [PATCH] rebase: set REF_HEAD_DETACH in checkout_up_to_date() John Cai via GitGitGadget
2022-03-11 5:33 ` Junio C Hamano
2022-03-11 5:55 ` Junio C Hamano
2022-03-11 14:14 ` John Cai
2022-03-11 15:05 ` Phillip Wood
2022-03-11 15:28 ` John Cai
2022-03-11 19:42 ` John Cai
2022-03-11 21:31 ` Phillip Wood
2022-03-11 17:24 ` [PATCH v2 0/2] rebase: update HEAD when is an oid John Cai via GitGitGadget
2022-03-11 17:24 ` [PATCH v2 1/2] rebase: use test_commit helper in setup John Cai via GitGitGadget
2022-03-13 7:50 ` Junio C Hamano
2022-03-14 10:52 ` Phillip Wood
2022-03-14 21:47 ` Junio C Hamano
2022-03-11 17:24 ` [PATCH v2 2/2] rebase: set REF_HEAD_DETACH in checkout_up_to_date() John Cai via GitGitGadget
2022-03-13 7:58 ` Junio C Hamano
2022-03-14 10:54 ` Phillip Wood
2022-03-14 14:05 ` Phillip Wood
2022-03-14 14:11 ` John Cai
2022-03-14 14:25 ` Phillip Wood
2022-03-17 3:16 ` [PATCH v3 0/2] rebase: update HEAD when is an oid John Cai via GitGitGadget
2022-03-17 3:16 ` [PATCH v3 1/2] rebase: use test_commit helper in setup John Cai via GitGitGadget
2022-03-17 13:37 ` Ævar Arnfjörð Bjarmason [this message]
2022-03-17 3:16 ` [PATCH v3 2/2] rebase: set REF_HEAD_DETACH in checkout_up_to_date() John Cai via GitGitGadget
2022-03-17 13:42 ` Ævar Arnfjörð Bjarmason
2022-03-17 15:34 ` Junio C Hamano
2022-03-17 19:53 ` [PATCH v4 0/3] rebase: update HEAD when is an oid John Cai via GitGitGadget
2022-03-17 19:53 ` [PATCH v4 1/3] rebase: test showing bug in rebase with non-branch John Cai via GitGitGadget
2022-03-17 21:10 ` Junio C Hamano
2022-03-17 21:37 ` Junio C Hamano
2022-03-17 22:44 ` John Cai
2022-03-17 19:53 ` [PATCH v4 2/3] rebase: use test_commit helper in setup John Cai via GitGitGadget
2022-03-18 11:14 ` Phillip Wood
2022-03-18 13:06 ` John Cai
2022-03-17 19:53 ` [PATCH v4 3/3] rebase: set REF_HEAD_DETACH in checkout_up_to_date() John Cai via GitGitGadget
2022-03-17 21:36 ` Junio C Hamano
2022-03-18 0:30 ` John Cai
2022-03-18 13:54 ` [PATCH v5 0/2] rebase: update HEAD when is an oid John Cai via GitGitGadget
2022-03-18 13:54 ` [PATCH v5 1/2] rebase: use test_commit helper in setup John Cai via GitGitGadget
2022-03-18 16:51 ` Junio C Hamano
2022-03-18 13:54 ` [PATCH v5 2/2] rebase: set REF_HEAD_DETACH in checkout_up_to_date() John Cai via GitGitGadget
2022-03-18 16:55 ` [PATCH v5 0/2] rebase: update HEAD when is an oid 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=220317.86v8wcd7ig.gmgdl@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=johncai86@gmail.com \
--cc=phillip.wood123@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).