From: "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Elijah Newren <newren@gmail.com>
Subject: [PATCH 0/5] Testcase cleanups (merge related)
Date: Thu, 27 Feb 2020 00:14:19 +0000 [thread overview]
Message-ID: <pull.716.git.git.1582762465.gitgitgadget@gmail.com> (raw)
This series has a few testcase cleanups, and a new testcase. In more detail:
* The first three patches are just various forms of testcase modernization
* The fourth patch updates some tests to check intended behavior instead of
a proxy thereof
* The fifth patch adds a new simple testcase that there is no other
merge/rebase/cherry-pick test for in our testsuite, just for added
defensiveness.
As a side note: t60[01]* is used by rev-list, and then t60[234].sh is kinda
taken by merge-recursive except that t6030 and t6041 are for bisect and
t6040 for remote tracking stuff. Because t60[234].sh got filled up, rev-list
spilled over to t61[01]* as well. It's all kind of a mess. I'm curious if
moving the merge stuff over to t64* would make sense, since that'd keep the
merge stuff together, and would also free up space for rev-list, bisect,
remote-tracking and whatnot. Would that just be too much churn?
Elijah Newren (5):
t602[1236], t6034: modernize test formatting
t6020, t6022, t6035: update merge tests to use test helper functions
t3035: prefer test_must_fail to bash negation for git commands
t6022, t6046: test expected behavior instead of testing a proxy for it
t6020: new test with interleaved lexicographic ordering of directories
t/t3035-merge-sparse.sh | 4 +-
t/t6020-merge-df.sh | 55 ++-
t/t6021-merge-criss-cross.sh | 135 +++---
t/t6022-merge-rename.sh | 382 +++++++++--------
t/t6023-merge-file.sh | 568 +++++++++++++------------
t/t6026-merge-attr.sh | 46 +-
t/t6034-merge-rename-nocruft.sh | 122 +++---
t/t6035-merge-dir-to-symlink.sh | 28 +-
t/t6046-merge-skip-unneeded-updates.sh | 89 ++--
9 files changed, 752 insertions(+), 677 deletions(-)
base-commit: 2d2118b814c11f509e1aa76cb07110f7231668dc
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-716%2Fnewren%2Ftestcase-cleanups-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-716/newren/testcase-cleanups-v1
Pull-Request: https://github.com/git/git/pull/716
--
gitgitgadget
next reply other threads:[~2020-02-27 0:14 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-27 0:14 Elijah Newren via GitGitGadget [this message]
2020-02-27 0:14 ` [PATCH 1/5] t602[1236], t6034: modernize test formatting Elijah Newren via GitGitGadget
2020-02-27 0:14 ` [PATCH 2/5] t6020, t6022, t6035: update merge tests to use test helper functions Elijah Newren via GitGitGadget
2020-02-27 0:14 ` [PATCH 3/5] t3035: prefer test_must_fail to bash negation for git commands Elijah Newren via GitGitGadget
2020-02-27 0:14 ` [PATCH 4/5] t6022, t6046: test expected behavior instead of testing a proxy for it Elijah Newren via GitGitGadget
2020-03-12 13:20 ` SZEDER Gábor
2020-03-12 16:48 ` Elijah Newren
2020-03-12 17:35 ` Elijah Newren
2020-03-12 20:01 ` SZEDER Gábor
2020-03-13 17:17 ` SZEDER Gábor
2020-03-13 17:45 ` Elijah Newren
2020-03-13 17:12 ` SZEDER Gábor
2020-03-13 17:18 ` Elijah Newren
2020-03-13 17:30 ` SZEDER Gábor
2020-03-13 18:11 ` Elijah Newren
2020-02-27 0:14 ` [PATCH 5/5] t6020: new test with interleaved lexicographic ordering of directories Elijah Newren 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
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=pull.716.git.git.1582762465.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=newren@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).