From: "John Cai via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: John Cai <johncai86@gmail.com>, John Cai <johncai86@gmail.com>
Subject: [PATCH 05/10] t7600-merge: modernize test format
Date: Sat, 20 May 2023 16:13:53 +0000 [thread overview]
Message-ID: <4774e05d099234887acb210af86a7ce484b6def9.1684599239.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1514.git.git.1684599239.gitgitgadget@gmail.com>
From: John Cai <johncai86@gmail.com>
Some tests still use the old format with four spaces indentation.
Standardize the tests to the new format with tab indentation.
Signed-off-by: John Cai <johncai86@gmail.com>
---
t/t7600-merge.sh | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 060e145957f..fdc607277c2 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -639,41 +639,41 @@ test_expect_success 'merge log message' '
test_debug 'git log --graph --decorate --oneline --all'
test_expect_success 'merge c1 with c0, c2, c0, and c1' '
- git reset --hard c1 &&
- test_tick &&
- git merge c0 c2 c0 c1 &&
- verify_merge file result.1-5 &&
- verify_parents $c1 $c2
+ git reset --hard c1 &&
+ test_tick &&
+ git merge c0 c2 c0 c1 &&
+ verify_merge file result.1-5 &&
+ verify_parents $c1 $c2
'
test_debug 'git log --graph --decorate --oneline --all'
test_expect_success 'merge c1 with c0, c2, c0, and c1' '
- git reset --hard c1 &&
- test_tick &&
- git merge c0 c2 c0 c1 &&
- verify_merge file result.1-5 &&
- verify_parents $c1 $c2
+ git reset --hard c1 &&
+ test_tick &&
+ git merge c0 c2 c0 c1 &&
+ verify_merge file result.1-5 &&
+ verify_parents $c1 $c2
'
test_debug 'git log --graph --decorate --oneline --all'
test_expect_success 'merge c1 with c1 and c2' '
- git reset --hard c1 &&
- test_tick &&
- git merge c1 c2 &&
- verify_merge file result.1-5 &&
- verify_parents $c1 $c2
+ git reset --hard c1 &&
+ test_tick &&
+ git merge c1 c2 &&
+ verify_merge file result.1-5 &&
+ verify_parents $c1 $c2
'
test_debug 'git log --graph --decorate --oneline --all'
test_expect_success 'merge fast-forward in a dirty tree' '
- git reset --hard c0 &&
- mv file file1 &&
- cat file1 >file &&
- rm -f file1 &&
- git merge c2
+ git reset --hard c0 &&
+ mv file file1 &&
+ cat file1 >file &&
+ rm -f file1 &&
+ git merge c2
'
test_debug 'git log --graph --decorate --oneline --all'
--
gitgitgadget
next prev parent reply other threads:[~2023-05-20 16:14 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-20 16:13 [PATCH 00/10] tests: modernize test format part 2 John Cai via GitGitGadget
2023-05-20 16:13 ` [PATCH 01/10] t7110-reset-merge: modernize test format John Cai via GitGitGadget
2023-05-20 16:13 ` [PATCH 02/10] t7111-reset-table: " John Cai via GitGitGadget
2023-05-20 16:13 ` [PATCH 03/10] t7201-co: " John Cai via GitGitGadget
2023-05-20 16:13 ` [PATCH 04/10] t7508-status: " John Cai via GitGitGadget
2023-05-20 16:13 ` John Cai via GitGitGadget [this message]
2023-05-20 16:13 ` [PATCH 06/10] t7700-repack: " John Cai via GitGitGadget
2023-05-20 16:13 ` [PATCH 07/10] t9100-git-svn-basic: " John Cai via GitGitGadget
2023-05-20 16:13 ` [PATCH 08/10] t9104-git-svn-follow-parent: " John Cai via GitGitGadget
2023-05-20 16:13 ` [PATCH 09/10] t9200-git-cvsexportcommit: " John Cai via GitGitGadget
2023-05-20 16:13 ` [PATCH 10/10] t9400-git-cvsserver-server: " John Cai via GitGitGadget
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=4774e05d099234887acb210af86a7ce484b6def9.1684599239.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=johncai86@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 read-only IMAP folder(s) and NNTP newsgroup(s).