Re: [PATCH v2 13/13] Add testing with merge-ort merge strategy

From: Derrick Stolee <stolee@gmail.com>
Date: Mar 19, 2021, 13:05 UTC
Message-ID: <6b619bd0-c924-274e-d8bb-3bb9c67a2625@gmail.com>
In-Reply-To: <d8536f56ab296171c09e667e5c9299e95078388e.1616016485.git.gitgitgadget@gmail.com>

On 3/17/2021 5:28 PM, Elijah Newren via GitGitGadget wrote:

> From: Elijah Newren <newren@gmail.com>
> 
> In preparation for switching from merge-recursive to merge-ort as the
> default strategy, ensure that we are testing it.

OK, so here we are testing it by default in CI, not just in that second round of optional environment variables. If that is what you intended, then this is the diff I was expecting:

diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
index a66b5e8c75a..c013e9e646a 100755
--- a/ci/run-build-and-tests.sh
+++ b/ci/run-build-and-tests.sh
@@ -25,6 +25,7 @@ linux-gcc)
 	export GIT_TEST_ADD_I_USE_BUILTIN=1
 	export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
 	export GIT_TEST_WRITE_REV_INDEX=1
+	export GIT_TEST_MERGE_STRATEGY=org
 	make test
 	;;
 linux-clang)

However, if we want to be aggressive in adopting the ort strategy
very soon, then your approach of testing more frequently is
valuable.

Would it be worth setting GIT_TEST_MERGE_ALGORITHM=ort by default
in test-lib.sh, too? That could help developers working on top of
your topic avoid creating test failures that only show up in CI.

Thanks,
-Stolee