Skip to content

Commit bfbd201

Browse files
newrengitster
newren
authored and
gitster
committed
tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithm
Both of these existed to allow us to reuse all the merge-related tests in the testsuite while easily flipping between the 'recursive' and the 'ort' backends. Now that we have removed merge-recursive and remapped 'recursive' to mean 'ort', we don't need this scaffolding anymore. Signed-off-by: Elijah Newren <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent ad45b32 commit bfbd201

29 files changed

+248
-874
lines changed

‎ci/run-build-and-tests.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ linux-breaking-changes)
2020
linux-TEST-vars)
2121
export OPENSSL_SHA1_UNSAFE=YesPlease
2222
export GIT_TEST_SPLIT_INDEX=yes
23-
export GIT_TEST_MERGE_ALGORITHM=recursive
2423
export GIT_TEST_FULL_IN_PACK_ARRAY=true
2524
export GIT_TEST_OE_SIZE=10
2625
export GIT_TEST_OE_DELTA_SIZE=5

‎t/lib-merge.sh

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎t/t1092-sparse-checkout-compatibility.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1486,7 +1486,6 @@ test_expect_success 'sparse-index is not expanded' '
14861486
ensure_not_expanded checkout -f update-deep &&
14871487
test_config -C sparse-index pull.twohead ort &&
14881488
(
1489-
sane_unset GIT_TEST_MERGE_ALGORITHM &&
14901489
for OPERATION in "merge -m merge" cherry-pick rebase
14911490
do
14921491
ensure_not_expanded merge -m merge update-folder1 &&
@@ -1506,7 +1505,6 @@ test_expect_success 'sparse-index is not expanded: merge conflict in cone' '
15061505
done &&
15071506
15081507
(
1509-
sane_unset GIT_TEST_MERGE_ALGORITHM &&
15101508
git -C sparse-index config pull.twohead ort &&
15111509
ensure_not_expanded ! merge -m merged expand-right
15121510
)

‎t/t2501-cwd-empty.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,6 @@ test_expect_success 'merge fails if cwd needs to be removed; recursive friendly'
117117
grep "Refusing to remove the current working directory" error
118118
'
119119

120-
GIT_TEST_MERGE_ALGORITHM=ort
121-
122120
test_expect_success 'merge fails if cwd needs to be removed' '
123121
test_required_dir_removal git merge fd_conflict
124122
'

‎t/t3512-cherry-pick-submodule.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
88
. ./test-lib.sh
99
. "$TEST_DIRECTORY"/lib-submodule-update.sh
1010

11-
if test "$GIT_TEST_MERGE_ALGORITHM" != ort
12-
then
13-
KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
14-
KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
15-
fi
1611
test_submodule_switch "cherry-pick"
1712

1813
test_expect_success 'unrelated submodule/file conflict is ignored' '

‎t/t3513-revert-submodule.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ git_revert () {
3030
git revert HEAD
3131
}
3232

33-
if test "$GIT_TEST_MERGE_ALGORITHM" != ort
34-
then
35-
KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
36-
fi
3733
test_submodule_switch_func "git_revert"
3834

3935
test_done

‎t/t4069-remerge-diff.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,6 @@ test_description='remerge-diff handling'
44

55
. ./test-lib.sh
66

7-
# This test is ort-specific
8-
if test "${GIT_TEST_MERGE_ALGORITHM}" != ort
9-
then
10-
skip_all="GIT_TEST_MERGE_ALGORITHM != ort"
11-
test_done
12-
fi
13-
147
test_expect_success 'setup basic merges' '
158
test_write_lines 1 2 3 4 5 6 7 8 9 >numbers &&
169
git add numbers &&

‎t/t4301-merge-tree-write-tree.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,6 @@ test_description='git merge-tree --write-tree'
44

55
. ./test-lib.sh
66

7-
# This test is ort-specific
8-
if test "$GIT_TEST_MERGE_ALGORITHM" != "ort"
9-
then
10-
skip_all="GIT_TEST_MERGE_ALGORITHM != ort"
11-
test_done
12-
fi
13-
147
test_expect_success setup '
158
test_write_lines 1 2 3 4 5 >numbers &&
169
echo hello >greeting &&

‎t/t5572-pull-submodule.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,6 @@ git_pull_noff () {
4545
$2 git pull --no-ff
4646
}
4747

48-
if test "$GIT_TEST_MERGE_ALGORITHM" != ort
49-
then
50-
KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
51-
KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
52-
fi
5348
test_submodule_switch_func "git_pull_noff"
5449

5550
test_expect_success 'setup' '

‎t/t6400-merge-df.sh

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,7 @@ test_expect_success 'modify/delete + directory/file conflict' '
8484
8585
test_stdout_line_count = 5 git ls-files -s &&
8686
test_stdout_line_count = 4 git ls-files -u &&
87-
if test "$GIT_TEST_MERGE_ALGORITHM" = ort
88-
then
89-
test_stdout_line_count = 0 git ls-files -o
90-
else
91-
test_stdout_line_count = 1 git ls-files -o
92-
fi &&
87+
test_stdout_line_count = 0 git ls-files -o &&
9388
9489
test_path_is_file letters/file &&
9590
test_path_is_file letters.txt &&
@@ -105,12 +100,7 @@ test_expect_success 'modify/delete + directory/file conflict; other way' '
105100
106101
test_stdout_line_count = 5 git ls-files -s &&
107102
test_stdout_line_count = 4 git ls-files -u &&
108-
if test "$GIT_TEST_MERGE_ALGORITHM" = ort
109-
then
110-
test_stdout_line_count = 0 git ls-files -o
111-
else
112-
test_stdout_line_count = 1 git ls-files -o
113-
fi &&
103+
test_stdout_line_count = 0 git ls-files -o &&
114104
115105
test_path_is_file letters/file &&
116106
test_path_is_file letters.txt &&

0 commit comments

Comments
 (0)