Collect merge-related tests to t64xx

The tests for the merge machinery are spread over several places.
Collect them into t64xx for simplicity.  Some notes:

t60[234]*.sh:
  Merge tests started in t602*, overgrew bisect and remote tracking
  tests in t6030, t6040, and t6041, and nearly overtook replace tests
  in t6050.  This made picking out relevant tests that I wanted to run
  in a tighter loop slightly more annoying for years.

t303*.sh:
  These started out as tests for the 'merge-recursive' toplevel command,
  but did not restrict to that and had lots of overlap with the
  underlying merge machinery.
t7405, t7613:
  submodule-specific merge logic started out in submodule.c but was
  moved to merge-recursive.c in commit 18cfc08866 ("submodule.c: move
  submodule merging to merge-recursive.c", 2018-05-15).  Since these
  tests are about the logic found in the merge machinery, moving these
  tests to be with the merge tests makes sense.

t7607, t7609:
  Having tests spread all over the place makes it more likely that
  additional tests related to a certain piece of logic grow in all those
  other places.  Much like t303*.sh, these two tests were about the
  underlying merge machinery rather than outer levels.

Tests that were NOT moved:

t76[01]*.sh:
  Other than the four tests mentioned above, the remaining tests in
  t76[01]*.sh are related to non-recursive merge strategies, parameter
  parsing, and other stuff associated with the highlevel builtin/merge.c
  rather than the recursive merge machinery.

t3[45]*.sh:
  The rebase testcases in t34*.sh also test the merge logic pretty
  heavily; sometimes changes I make only trigger failures in the rebase
  tests.  The rebase tests are already nicely coupled together, though,
  and I didn't want to mess that up.  Similar comments apply for the
  cherry-pick tests in t35*.sh.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

1 files changed, 0 insertions, 131 deletions

diff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh
deleted file mode 100755
index 332cfc53fd..0000000000
--- a/t/t6024-recursive-merge.sh
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/bin/sh
-
-test_description='Test merge without common ancestors'
-. ./test-lib.sh
-
-# This scenario is based on a real-world repository of Shawn Pearce.
-
-# 1 - A - D - F
-#   \   X   /
-#     B   X
-#       X   \
-# 2 - C - E - G
-
-GIT_COMMITTER_DATE="2006-12-12 23:28:00 +0100"
-export GIT_COMMITTER_DATE
-
-test_expect_success 'setup tests' '
-	echo 1 >a1 &&
-	git add a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:00" git commit -m 1 a1 &&
-
-	git checkout -b A master &&
-	echo A >a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:01" git commit -m A a1 &&
-
-	git checkout -b B master &&
-	echo B >a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:02" git commit -m B a1 &&
-
-	git checkout -b D A &&
-	git rev-parse B >.git/MERGE_HEAD &&
-	echo D >a1 &&
-	git update-index a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:03" git commit -m D &&
-
-	git symbolic-ref HEAD refs/heads/other &&
-	echo 2 >a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:04" git commit -m 2 a1 &&
-
-	git checkout -b C &&
-	echo C >a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:05" git commit -m C a1 &&
-
-	git checkout -b E C &&
-	git rev-parse B >.git/MERGE_HEAD &&
-	echo E >a1 &&
-	git update-index a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:06" git commit -m E &&
-
-	git checkout -b G E &&
-	git rev-parse A >.git/MERGE_HEAD &&
-	echo G >a1 &&
-	git update-index a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:07" git commit -m G &&
-
-	git checkout -b F D &&
-	git rev-parse C >.git/MERGE_HEAD &&
-	echo F >a1 &&
-	git update-index a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:08" git commit -m F &&
-
-	test_oid_cache <<-EOF
-	idxstage1 sha1:ec3fe2a791706733f2d8fa7ad45d9a9672031f5e
-	idxstage1 sha256:b3c8488929903aaebdeb22270cb6d36e5b8724b01ae0d4da24632f158c99676f
-	EOF
-'
-
-test_expect_success 'combined merge conflicts' '
-	test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git merge -m final G
-'
-
-test_expect_success 'result contains a conflict' '
-	cat >expect <<-\EOF &&
-	<<<<<<< HEAD
-	F
-	=======
-	G
-	>>>>>>> G
-	EOF
-
-	test_cmp expect a1
-'
-
-test_expect_success 'virtual trees were processed' '
-	git ls-files --stage >out &&
-
-	cat >expect <<-EOF &&
-	100644 $(test_oid idxstage1) 1	a1
-	100644 $(git rev-parse F:a1) 2	a1
-	100644 $(git rev-parse G:a1) 3	a1
-	EOF
-
-	test_cmp expect out
-'
-
-test_expect_success 'refuse to merge binary files' '
-	git reset --hard &&
-	printf "\0" >binary-file &&
-	git add binary-file &&
-	git commit -m binary &&
-	git checkout G &&
-	printf "\0\0" >binary-file &&
-	git add binary-file &&
-	git commit -m binary2 &&
-	test_must_fail git merge F >merge.out 2>merge.err &&
-	grep "Cannot merge binary files: binary-file (HEAD vs. F)" merge.err
-'
-
-test_expect_success 'mark rename/delete as unmerged' '
-
-	git reset --hard &&
-	git checkout -b delete &&
-	git rm a1 &&
-	test_tick &&
-	git commit -m delete &&
-	git checkout -b rename HEAD^ &&
-	git mv a1 a2 &&
-	test_tick &&
-	git commit -m rename &&
-	test_must_fail git merge delete &&
-	test 1 = $(git ls-files --unmerged | wc -l) &&
-	git rev-parse --verify :2:a2 &&
-	test_must_fail git rev-parse --verify :3:a2 &&
-	git checkout -f delete &&
-	test_must_fail git merge rename &&
-	test 1 = $(git ls-files --unmerged | wc -l) &&
-	test_must_fail git rev-parse --verify :2:a2 &&
-	git rev-parse --verify :3:a2
-'
-
-test_done