{"thread":{"id":"58337","subject":"[PATCH] t64??: convert 'test_create_repo' to 'git init'","startedAt":"2022-08-20T22:34:07Z","lastAt":"2022-08-26T03:49:30Z","messageCount":3,"participants":["Elijah Newren via GitGitGadget","Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"461667","messageId":"pull.1303.git.git.1661034837118.gitgitgadget@gmail.com","threadId":"58337","inReplyTo":null,"subject":"[PATCH] t64??: convert 'test_create_repo' to 'git init'","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2022-08-20T22:33:56Z","receivedAt":"2022-08-20T22:34:07Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren <newren@gmail.com>\n\nAs promised[1], convert the merge-specific tests over to using 'git\ninit' instead of 'test_create_repo'.\n\n[1] https://lore.kernel.org/git/CABPp-BEcojvfeuhp7rSi-O+9oEu4KpwPDwbKS-MiD1qCKde-CA@mail.gmail.com/\n\nSigned-off-by: Elijah Newren <newren@gmail.com>\n---\n    t64??: convert 'test_create_repo' to 'git init'\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1303%2Fnewren%2Fnuke_test_create_repo_in_merge_tests-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1303/newren/nuke_test_create_repo_in_merge_tests-v1\nPull-Request: https://github.com/git/git/pull/1303\n\n t/t6400-merge-df.sh                      |   2 +-\n t/t6406-merge-attr.sh                    |   4 +-\n t/t6416-recursive-corner-cases.sh        |  38 +++----\n t/t6421-merge-partial-clone.sh           |   2 +-\n t/t6422-merge-rename-corner-cases.sh     |  38 +++----\n t/t6423-merge-rename-directories.sh      | 138 +++++++++++------------\n t/t6426-merge-skip-unneeded-updates.sh   |  16 +--\n t/t6427-diff3-conflict-markers.sh        |  10 +-\n t/t6428-merge-conflicts-sparse.sh        |   2 +-\n t/t6429-merge-sequence-rename-caching.sh |  14 +--\n t/t6437-submodule-merge.sh               |   8 +-\n 11 files changed, 136 insertions(+), 136 deletions(-)\n\ndiff --git a/t/t6400-merge-df.sh b/t/t6400-merge-df.sh\nindex 57a67cf3627..3de4ef6bd9e 100755\n--- a/t/t6400-merge-df.sh\n+++ b/t/t6400-merge-df.sh\n@@ -126,7 +126,7 @@ test_expect_success 'Simple merge in repo with interesting pathnames' '\n \t#     foo/bar-2/baz\n \t# The fact that foo/bar-2 appears between foo/bar and foo/bar/baz\n \t# can trip up some codepaths, and is the point of this test.\n-\ttest_create_repo name-ordering &&\n+\tgit init name-ordering &&\n \t(\n \t\tcd name-ordering &&\n \ndiff --git a/t/t6406-merge-attr.sh b/t/t6406-merge-attr.sh\nindex 99abefd44b9..8650a88c40a 100755\n--- a/t/t6406-merge-attr.sh\n+++ b/t/t6406-merge-attr.sh\n@@ -162,8 +162,8 @@ test_expect_success 'custom merge backend' '\n '\n \n test_expect_success 'up-to-date merge without common ancestor' '\n-\ttest_create_repo repo1 &&\n-\ttest_create_repo repo2 &&\n+\tgit init repo1 &&\n+\tgit init repo2 &&\n \ttest_tick &&\n \t(\n \t\tcd repo1 &&\ndiff --git a/t/t6416-recursive-corner-cases.sh b/t/t6416-recursive-corner-cases.sh\nindex 690c8482b13..17b54d625d0 100755\n--- a/t/t6416-recursive-corner-cases.sh\n+++ b/t/t6416-recursive-corner-cases.sh\n@@ -19,7 +19,7 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n #\n \n test_expect_success 'setup basic criss-cross + rename with no modifications' '\n-\ttest_create_repo basic-rename &&\n+\tgit init basic-rename &&\n \t(\n \t\tcd basic-rename &&\n \n@@ -85,7 +85,7 @@ test_expect_success 'merge simple rename+criss-cross with no modifications' '\n #\n \n test_expect_success 'setup criss-cross + rename merges with basic modification' '\n-\ttest_create_repo rename-modify &&\n+\tgit init rename-modify &&\n \t(\n \t\tcd rename-modify &&\n \n@@ -160,7 +160,7 @@ test_expect_success 'merge criss-cross + rename merges with basic modification'\n #\n \n test_expect_success 'setup differently handled merges of rename/add conflict' '\n-\ttest_create_repo rename-add &&\n+\tgit init rename-add &&\n \t(\n \t\tcd rename-add &&\n \n@@ -324,7 +324,7 @@ test_expect_success 'git detects differently handled merges conflict, swapped' '\n # Merging commits D & E should result in modify/delete conflict.\n \n test_expect_success 'setup criss-cross + modify/delete resolved differently' '\n-\ttest_create_repo modify-delete &&\n+\tgit init modify-delete &&\n \t(\n \t\tcd modify-delete &&\n \n@@ -499,7 +499,7 @@ test_expect_success 'git detects conflict merging criss-cross+modify/delete, rev\n #\n \n test_expect_success 'setup differently handled merges of directory/file conflict' '\n-\ttest_create_repo directory-file &&\n+\tgit init directory-file &&\n \t(\n \t\tcd directory-file &&\n \n@@ -867,7 +867,7 @@ test_expect_failure 'merge of D2 & E4 merges a2s & reports conflict for a/file'\n # but that may cancel out at the final merge stage\".\n \n test_expect_success 'setup rename/rename(1to2)/modify followed by what looks like rename/rename(2to1)/modify' '\n-\ttest_create_repo rename-squared-squared &&\n+\tgit init rename-squared-squared &&\n \t(\n \t\tcd rename-squared-squared &&\n \n@@ -944,7 +944,7 @@ test_expect_success 'handle rename/rename(1to2)/modify followed by what looks li\n # content merge handled.\n \n test_expect_success 'setup criss-cross + rename/rename/add-source + modify/modify' '\n-\ttest_create_repo rename-rename-add-source &&\n+\tgit init rename-rename-add-source &&\n \t(\n \t\tcd rename-rename-add-source &&\n \n@@ -1032,7 +1032,7 @@ test_expect_failure 'detect rename/rename/add-source for virtual merge-base' '\n # base of B & C needs to not delete B:c for that to work, though...\n \n test_expect_success 'setup criss-cross+rename/rename/add-dest + simple modify' '\n-\ttest_create_repo rename-rename-add-dest &&\n+\tgit init rename-rename-add-dest &&\n \t(\n \t\tcd rename-rename-add-dest &&\n \n@@ -1111,7 +1111,7 @@ test_expect_success 'virtual merge base handles rename/rename(1to2)/add-dest' '\n # git detect it?\n \n test_expect_success 'setup symlink modify/modify' '\n-\ttest_create_repo symlink-modify-modify &&\n+\tgit init symlink-modify-modify &&\n \t(\n \t\tcd symlink-modify-modify &&\n \n@@ -1178,7 +1178,7 @@ test_expect_merge_algorithm failure success 'check symlink modify/modify' '\n # git detect it?\n \n test_expect_success 'setup symlink add/add' '\n-\ttest_create_repo symlink-add-add &&\n+\tgit init symlink-add-add &&\n \t(\n \t\tcd symlink-add-add &&\n \n@@ -1244,11 +1244,11 @@ test_expect_merge_algorithm failure success 'check symlink add/add' '\n # git detect it?\n \n test_expect_success 'setup submodule modify/modify' '\n-\ttest_create_repo submodule-modify-modify &&\n+\tgit init submodule-modify-modify &&\n \t(\n \t\tcd submodule-modify-modify &&\n \n-\t\ttest_create_repo submod &&\n+\t\tgit init submod &&\n \t\t(\n \t\t\tcd submod &&\n \t\t\ttouch file-A &&\n@@ -1332,11 +1332,11 @@ test_expect_merge_algorithm failure success 'check submodule modify/modify' '\n # git detect it?\n \n test_expect_success 'setup submodule add/add' '\n-\ttest_create_repo submodule-add-add &&\n+\tgit init submodule-add-add &&\n \t(\n \t\tcd submodule-add-add &&\n \n-\t\ttest_create_repo submod &&\n+\t\tgit init submod &&\n \t\t(\n \t\t\tcd submod &&\n \t\t\ttouch file-A &&\n@@ -1419,11 +1419,11 @@ test_expect_merge_algorithm failure success 'check submodule add/add' '\n # This is an obvious add/add conflict for 'path'.  Can git detect it?\n \n test_expect_success 'setup conflicting entry types (submodule vs symlink)' '\n-\ttest_create_repo submodule-symlink-add-add &&\n+\tgit init submodule-symlink-add-add &&\n \t(\n \t\tcd submodule-symlink-add-add &&\n \n-\t\ttest_create_repo path &&\n+\t\tgit init path &&\n \t\t(\n \t\t\tcd path &&\n \t\t\ttouch file-B &&\n@@ -1494,7 +1494,7 @@ test_expect_merge_algorithm failure success 'check conflicting entry types (subm\n # This is an obvious add/add mode conflict.  Can git detect it?\n \n test_expect_success 'setup conflicting modes for regular file' '\n-\ttest_create_repo regular-file-mode-conflict &&\n+\tgit init regular-file-mode-conflict &&\n \t(\n \t\tcd regular-file-mode-conflict &&\n \n@@ -1571,7 +1571,7 @@ test_expect_failure 'check conflicting modes for regular file' '\n #   to ensure that we handle it as well as practical.\n \n test_expect_success 'setup nested conflicts' '\n-\ttest_create_repo nested_conflicts &&\n+\tgit init nested_conflicts &&\n \t(\n \t\tcd nested_conflicts &&\n \n@@ -1757,7 +1757,7 @@ test_expect_success 'check nested conflicts' '\n #   have three levels of conflict markers.  Can we distinguish all three?\n \n test_expect_success 'setup virtual merge base with nested conflicts' '\n-\ttest_create_repo virtual_merge_base_has_nested_conflicts &&\n+\tgit init virtual_merge_base_has_nested_conflicts &&\n \t(\n \t\tcd virtual_merge_base_has_nested_conflicts &&\n \ndiff --git a/t/t6421-merge-partial-clone.sh b/t/t6421-merge-partial-clone.sh\nindex 36bcd7c3280..5413e5dd9d6 100755\n--- a/t/t6421-merge-partial-clone.sh\n+++ b/t/t6421-merge-partial-clone.sh\n@@ -31,7 +31,7 @@ test_description=\"limiting blob downloads when merging with partial clones\"\n \n test_setup_repo () {\n \ttest -d server && return\n-\ttest_create_repo server &&\n+\tgit init server &&\n \t(\n \t\tcd server &&\n \ndiff --git a/t/t6422-merge-rename-corner-cases.sh b/t/t6422-merge-rename-corner-cases.sh\nindex 9b65768aed6..346253c7c88 100755\n--- a/t/t6422-merge-rename-corner-cases.sh\n+++ b/t/t6422-merge-rename-corner-cases.sh\n@@ -11,7 +11,7 @@ TEST_PASSES_SANITIZE_LEAK=true\n . \"$TEST_DIRECTORY\"/lib-merge.sh\n \n test_setup_rename_delete_untracked () {\n-\ttest_create_repo rename-delete-untracked &&\n+\tgit init rename-delete-untracked &&\n \t(\n \t\tcd rename-delete-untracked &&\n \n@@ -56,7 +56,7 @@ test_expect_success \"Does git preserve Gollum's precious artifact?\" '\n # We should be able to merge B & C cleanly\n \n test_setup_rename_modify_add_source () {\n-\ttest_create_repo rename-modify-add-source &&\n+\tgit init rename-modify-add-source &&\n \t(\n \t\tcd rename-modify-add-source &&\n \n@@ -96,7 +96,7 @@ test_expect_failure 'rename/modify/add-source conflict resolvable' '\n '\n \n test_setup_break_detection_1 () {\n-\ttest_create_repo break-detection-1 &&\n+\tgit init break-detection-1 &&\n \t(\n \t\tcd break-detection-1 &&\n \n@@ -144,7 +144,7 @@ test_expect_failure 'conflict caused if rename not detected' '\n '\n \n test_setup_break_detection_2 () {\n-\ttest_create_repo break-detection-2 &&\n+\tgit init break-detection-2 &&\n \t(\n \t\tcd break-detection-2 &&\n \n@@ -192,7 +192,7 @@ test_expect_failure 'missed conflict if rename not detected' '\n #   Commit C: rename a->b, add unrelated a\n \n test_setup_break_detection_3 () {\n-\ttest_create_repo break-detection-3 &&\n+\tgit init break-detection-3 &&\n \t(\n \t\tcd break-detection-3 &&\n \n@@ -268,7 +268,7 @@ test_expect_failure 'detect rename/add-source and preserve all data, merge other\n '\n \n test_setup_rename_directory () {\n-\ttest_create_repo rename-directory-$1 &&\n+\tgit init rename-directory-$1 &&\n \t(\n \t\tcd rename-directory-$1 &&\n \n@@ -386,7 +386,7 @@ test_expect_success 'rename/directory conflict + content merge conflict' '\n '\n \n test_setup_rename_directory_2 () {\n-\ttest_create_repo rename-directory-2 &&\n+\tgit init rename-directory-2 &&\n \t(\n \t\tcd rename-directory-2 &&\n \n@@ -445,7 +445,7 @@ test_expect_success 'disappearing dir in rename/directory conflict handled' '\n #   Commit B: modify a, add different b\n \n test_setup_rename_with_content_merge_and_add () {\n-\ttest_create_repo rename-with-content-merge-and-add-$1 &&\n+\tgit init rename-with-content-merge-and-add-$1 &&\n \t(\n \t\tcd rename-with-content-merge-and-add-$1 &&\n \n@@ -570,7 +570,7 @@ test_expect_success 'handle rename-with-content-merge vs. add, merge other way'\n #   * Nothing else should be present.  Is anything?\n \n test_setup_rename_rename_2to1 () {\n-\ttest_create_repo rename-rename-2to1 &&\n+\tgit init rename-rename-2to1 &&\n \t(\n \t\tcd rename-rename-2to1 &&\n \n@@ -642,7 +642,7 @@ test_expect_success 'handle rename/rename (2to1) conflict correctly' '\n #   Commit B: rename a->b\n #   Commit C: rename a->c\n test_setup_rename_rename_1to2 () {\n-\ttest_create_repo rename-rename-1to2 &&\n+\tgit init rename-rename-1to2 &&\n \t(\n \t\tcd rename-rename-1to2 &&\n \n@@ -700,7 +700,7 @@ test_expect_success 'merge has correct working tree contents' '\n # Merging of B & C should NOT be clean; there's a rename/rename conflict\n \n test_setup_rename_rename_1to2_add_source_1 () {\n-\ttest_create_repo rename-rename-1to2-add-source-1 &&\n+\tgit init rename-rename-1to2-add-source-1 &&\n \t(\n \t\tcd rename-rename-1to2-add-source-1 &&\n \n@@ -748,7 +748,7 @@ test_expect_failure 'detect conflict with rename/rename(1to2)/add-source merge'\n '\n \n test_setup_rename_rename_1to2_add_source_2 () {\n-\ttest_create_repo rename-rename-1to2-add-source-2 &&\n+\tgit init rename-rename-1to2-add-source-2 &&\n \t(\n \t\tcd rename-rename-1to2-add-source-2 &&\n \n@@ -794,7 +794,7 @@ test_expect_failure 'rename/rename/add-source still tracks new a file' '\n '\n \n test_setup_rename_rename_1to2_add_dest () {\n-\ttest_create_repo rename-rename-1to2-add-dest &&\n+\tgit init rename-rename-1to2-add-dest &&\n \t(\n \t\tcd rename-rename-1to2-add-dest &&\n \n@@ -874,7 +874,7 @@ test_expect_success 'rename/rename/add-dest merge still knows about conflicting\n #   Expected: CONFLICT (rename/add/delete), two-way merged bar\n \n test_setup_rad () {\n-\ttest_create_repo rad &&\n+\tgit init rad &&\n \t(\n \t\tcd rad &&\n \t\techo \"original file\" >foo &&\n@@ -946,7 +946,7 @@ test_expect_merge_algorithm failure success 'rad-check: rename/add/delete confli\n #   Expected: CONFLICT (rename/rename/delete/delete), two-way merged baz\n \n test_setup_rrdd () {\n-\ttest_create_repo rrdd &&\n+\tgit init rrdd &&\n \t(\n \t\tcd rrdd &&\n \t\techo foo >foo &&\n@@ -1022,7 +1022,7 @@ test_expect_merge_algorithm failure success 'rrdd-check: rename/rename(2to1)/del\n #             multi-way merged contents found in two, four, six\n \n test_setup_mod6 () {\n-\ttest_create_repo mod6 &&\n+\tgit init mod6 &&\n \t(\n \t\tcd mod6 &&\n \t\ttest_seq 11 19 >one &&\n@@ -1160,7 +1160,7 @@ test_conflicts_with_adds_and_renames() {\n \t#      tree\n \ttest_setup_collision_conflict () {\n \t#test_expect_success \"setup simple $sideL/$sideR conflict\" '\n-\t\ttest_create_repo simple_${sideL}_${sideR} &&\n+\t\tgit init simple_${sideL}_${sideR} &&\n \t\t(\n \t\t\tcd simple_${sideL}_${sideR} &&\n \n@@ -1308,7 +1308,7 @@ test_conflicts_with_adds_and_renames add    add\n #   So, we have four different conflicting files that all end up at path\n #   'three'.\n test_setup_nested_conflicts_from_rename_rename () {\n-\ttest_create_repo nested_conflicts_from_rename_rename &&\n+\tgit init nested_conflicts_from_rename_rename &&\n \t(\n \t\tcd nested_conflicts_from_rename_rename &&\n \n@@ -1417,7 +1417,7 @@ test_expect_success 'check nested conflicts from rename/rename(2to1)' '\n #   Expected: CONFLICT(rename/rename) message, three unstaged entries in the\n #             index, and contents of orig-[AB] at path orig-[AB]\n test_setup_rename_rename_1_to_2_binary () {\n-\ttest_create_repo rename_rename_1_to_2_binary &&\n+\tgit init rename_rename_1_to_2_binary &&\n \t(\n \t\tcd rename_rename_1_to_2_binary &&\n \ndiff --git a/t/t6423-merge-rename-directories.sh b/t/t6423-merge-rename-directories.sh\nindex 99baf77cbfd..a4941878fe2 100755\n--- a/t/t6423-merge-rename-directories.sh\n+++ b/t/t6423-merge-rename-directories.sh\n@@ -40,7 +40,7 @@ test_description=\"recursive merge with directory renames\"\n #   Expected: y/{b,c,d,e/f}\n \n test_setup_1a () {\n-\ttest_create_repo 1a &&\n+\tgit init 1a &&\n \t(\n \t\tcd 1a &&\n \n@@ -106,7 +106,7 @@ test_expect_success '1a: Simple directory rename detection' '\n #   Expected: y/{b,c,d,e}\n \n test_setup_1b () {\n-\ttest_create_repo 1b &&\n+\tgit init 1b &&\n \t(\n \t\tcd 1b &&\n \n@@ -169,7 +169,7 @@ test_expect_success '1b: Merge a directory with another' '\n #   Expected: y/{b,c,d}  (because x/d -> z/d -> y/d)\n \n test_setup_1c () {\n-\ttest_create_repo 1c &&\n+\tgit init 1c &&\n \t(\n \t\tcd 1c &&\n \n@@ -232,7 +232,7 @@ test_expect_success '1c: Transitive renaming' '\n #         y/wham_1 & z/wham_2 should too...giving us a conflict.\n \n test_setup_1d () {\n-\ttest_create_repo 1d &&\n+\tgit init 1d &&\n \t(\n \t\tcd 1d &&\n \n@@ -328,7 +328,7 @@ test_expect_success '1d: Directory renames cause a rename/rename(2to1) conflict'\n #   Expected: y/{newb,newc,d}\n \n test_setup_1e () {\n-\ttest_create_repo 1e &&\n+\tgit init 1e &&\n \t(\n \t\tcd 1e &&\n \n@@ -387,7 +387,7 @@ test_expect_success '1e: Renamed directory, with all files being renamed too' '\n #   Expected: y/{b,c}, x/{d,e,f,g}\n \n test_setup_1f () {\n-\ttest_create_repo 1f &&\n+\tgit init 1f &&\n \t(\n \t\tcd 1f &&\n \n@@ -476,7 +476,7 @@ test_expect_success '1f: Split a directory into two other directories' '\n #   Commit B: z/{b,c,d}\n #   Expected: y/b, w/c, z/d, with warning about z/ -> (y/ vs. w/) conflict\n test_setup_2a () {\n-\ttest_create_repo 2a &&\n+\tgit init 2a &&\n \t(\n \t\tcd 2a &&\n \n@@ -538,7 +538,7 @@ test_expect_success '2a: Directory split into two on one side, with equal number\n #   Commit B: z/{b,c}, x/d\n #   Expected: y/b, w/c, x/d; No warning about z/ -> (y/ vs. w/) conflict\n test_setup_2b () {\n-\ttest_create_repo 2b &&\n+\tgit init 2b &&\n \t(\n \t\tcd 2b &&\n \n@@ -620,7 +620,7 @@ test_expect_success '2b: Directory split into two on one side, with equal number\n #   Commit B: y/{b,c}, x/d\n #   Expected: y/{b,c}, x/d\n test_setup_3a () {\n-\ttest_create_repo 3a &&\n+\tgit init 3a &&\n \t(\n \t\tcd 3a &&\n \n@@ -684,7 +684,7 @@ test_expect_success '3a: Avoid implicit rename if involved as source on other si\n #         end up with CONFLICT:(z/d -> y/d vs. x/d vs. w/d), i.e. a\n #         rename/rename/rename(1to3) conflict, which is just weird.\n test_setup_3b () {\n-\ttest_create_repo 3b &&\n+\tgit init 3b &&\n \t(\n \t\tcd 3b &&\n \n@@ -807,7 +807,7 @@ test_expect_success '3b: Avoid implicit rename if involved as source on current\n #   NOTE: Even though most files from z moved to y, we don't want f to follow.\n \n test_setup_4a () {\n-\ttest_create_repo 4a &&\n+\tgit init 4a &&\n \t(\n \t\tcd 4a &&\n \n@@ -896,7 +896,7 @@ test_expect_success '4a: Directory split, with original directory still present'\n #         index.\n \n test_setup_5a () {\n-\ttest_create_repo 5a &&\n+\tgit init 5a &&\n \t(\n \t\tcd 5a &&\n \n@@ -971,7 +971,7 @@ test_expect_success '5a: Merge directories, other side adds files to original an\n #         back to git behavior without the directory rename detection.\n \n test_setup_5b () {\n-\ttest_create_repo 5b &&\n+\tgit init 5b &&\n \t(\n \t\tcd 5b &&\n \n@@ -1048,7 +1048,7 @@ test_expect_success '5b: Rename/delete in order to get add/add/add conflict' '\n #             though, because it doesn't have anything in the way.\n \n test_setup_5c () {\n-\ttest_create_repo 5c &&\n+\tgit init 5c &&\n \t(\n \t\tcd 5c &&\n \n@@ -1138,7 +1138,7 @@ test_expect_success '5c: Transitive rename would cause rename/rename/rename/add/\n #         directory rename detection for z/f -> y/f.\n \n test_setup_5d () {\n-\ttest_create_repo 5d &&\n+\tgit init 5d &&\n \t(\n \t\tcd 5d &&\n \n@@ -1239,7 +1239,7 @@ test_expect_success '5d: Directory/file/file conflict due to directory rename' '\n #         it is also involved in a rename/delete conflict.\n \n test_setup_6a () {\n-\ttest_create_repo 6a &&\n+\tgit init 6a &&\n \t(\n \t\tcd 6a &&\n \n@@ -1337,7 +1337,7 @@ test_expect_success '6a: Tricky rename/delete' '\n #         the behavior on testcases 6b2 and 8e, and introduced this 6b1 testcase.\n \n test_setup_6b1 () {\n-\ttest_create_repo 6b1 &&\n+\tgit init 6b1 &&\n \t(\n \t\tcd 6b1 &&\n \n@@ -1415,7 +1415,7 @@ test_expect_merge_algorithm failure success '6b1: Same renames done on both side\n #         the z/ -> y/ rename.\n \n test_setup_6b2 () {\n-\ttest_create_repo 6b2 &&\n+\tgit init 6b2 &&\n \t(\n \t\tcd 6b2 &&\n \n@@ -1479,7 +1479,7 @@ test_expect_merge_algorithm failure success '6b2: Same rename done on both sides\n #         \"accidentally detect a rename\" and give us y/{b,c,d}.\n \n test_setup_6c () {\n-\ttest_create_repo 6c &&\n+\tgit init 6c &&\n \t(\n \t\tcd 6c &&\n \n@@ -1542,7 +1542,7 @@ test_expect_success '6c: Rename only done on same side' '\n #         doesn't \"accidentally detect a rename\" and give us y/{b,c,d}.\n \n test_setup_6d () {\n-\ttest_create_repo 6d &&\n+\tgit init 6d &&\n \t(\n \t\tcd 6d &&\n \n@@ -1605,7 +1605,7 @@ test_expect_success '6d: We do not always want transitive renaming' '\n #         add/add conflict on y/d_1 vs y/d_2.\n \n test_setup_6e () {\n-\ttest_create_repo 6e &&\n+\tgit init 6e &&\n \t(\n \t\tcd 6e &&\n \n@@ -1700,7 +1700,7 @@ test_expect_success '6e: Add/add from one side' '\n #   NOTE: There's a rename of z/ here, y/ has more renames, so z/d -> y/d.\n \n test_setup_7a () {\n-\ttest_create_repo 7a &&\n+\tgit init 7a &&\n \t(\n \t\tcd 7a &&\n \n@@ -1772,7 +1772,7 @@ test_expect_success '7a: rename-dir vs. rename-dir (NOT split evenly) PLUS add-o\n #   Expected: y/{b,c}, CONFLICT(rename/rename(2to1): x/d_1, w/d_2 -> y_d)\n \n test_setup_7b () {\n-\ttest_create_repo 7b &&\n+\tgit init 7b &&\n \t(\n \t\tcd 7b &&\n \n@@ -1861,7 +1861,7 @@ test_expect_success '7b: rename/rename(2to1), but only due to transitive rename'\n #         nor CONFLiCT x/d -> w/d vs. y/d vs. z/d)\n \n test_setup_7c () {\n-\ttest_create_repo 7c &&\n+\tgit init 7c &&\n \t(\n \t\tcd 7c &&\n \n@@ -1926,7 +1926,7 @@ test_expect_success '7c: rename/rename(1to...2or3); transitive rename may add co\n #   NOTE: z->y so NOT CONFLICT(delete x/d vs rename to z/d)\n \n test_setup_7d () {\n-\ttest_create_repo 7d &&\n+\tgit init 7d &&\n \t(\n \t\tcd 7d &&\n \n@@ -2027,7 +2027,7 @@ test_expect_success '7d: transitive rename involved in rename/delete; how is it\n #         how it's resolved.\n \n test_setup_7e () {\n-\ttest_create_repo 7e &&\n+\tgit init 7e &&\n \t(\n \t\tcd 7e &&\n \n@@ -2137,7 +2137,7 @@ test_expect_success '7e: transitive rename in rename/delete AND dirs in the way'\n # we potentially could.\n \n test_setup_8a () {\n-\ttest_create_repo 8a &&\n+\tgit init 8a &&\n \t(\n \t\tcd 8a &&\n \n@@ -2216,7 +2216,7 @@ test_expect_success '8a: Dual-directory rename, one into the others way' '\n # e_1 and e_2.\n \n test_setup_8b () {\n-\ttest_create_repo 8b &&\n+\tgit init 8b &&\n \t(\n \t\tcd 8b &&\n \n@@ -2290,7 +2290,7 @@ test_expect_success '8b: Dual-directory rename, one into the others way, with co\n #         notes in 8d.\n \n test_setup_8c () {\n-\ttest_create_repo 8c &&\n+\tgit init 8c &&\n \t(\n \t\tcd 8c &&\n \n@@ -2370,7 +2370,7 @@ test_expect_success '8c: modify/delete or rename+modify/delete' '\n #   differently.\n \n test_setup_8d () {\n-\ttest_create_repo 8d &&\n+\tgit init 8d &&\n \t(\n \t\tcd 8d &&\n \n@@ -2453,7 +2453,7 @@ test_expect_success '8d: rename/delete...or not?' '\n #        the behavior, and predict it without computing as many details.\n \n test_setup_8e () {\n-\ttest_create_repo 8e &&\n+\tgit init 8e &&\n \t(\n \t\tcd 8e &&\n \n@@ -2537,7 +2537,7 @@ test_expect_success '8e: Both sides rename, one side adds to original directory'\n #         of that could take the new file in commit B at z/i to x/w/i or x/i.\n \n test_setup_9a () {\n-\ttest_create_repo 9a &&\n+\tgit init 9a &&\n \t(\n \t\tcd 9a &&\n \n@@ -2609,7 +2609,7 @@ test_expect_success '9a: Inner renamed directory within outer renamed directory'\n #   Expected: y/{b,c,d_merged}\n \n test_setup_9b () {\n-\ttest_create_repo 9b &&\n+\tgit init 9b &&\n \t(\n \t\tcd 9b &&\n \n@@ -2697,7 +2697,7 @@ test_expect_success '9b: Transitive rename with content merge' '\n #         history for any implicit directory renames.\n \n test_setup_9c () {\n-\ttest_create_repo 9c &&\n+\tgit init 9c &&\n \t(\n \t\tcd 9c &&\n \n@@ -2786,7 +2786,7 @@ test_expect_success '9c: Doubly transitive rename?' '\n #   testcases and simplifies things for the user.\n \n test_setup_9d () {\n-\ttest_create_repo 9d &&\n+\tgit init 9d &&\n \t(\n \t\tcd 9d &&\n \n@@ -2861,7 +2861,7 @@ test_expect_success '9d: N-way transitive rename?' '\n #             dir1/yo, dir2/yo, dir3/yo, dirN/yo\n \n test_setup_9e () {\n-\ttest_create_repo 9e &&\n+\tgit init 9e &&\n \t(\n \t\tcd 9e &&\n \n@@ -2954,7 +2954,7 @@ test_expect_success '9e: N-to-1 whammo' '\n #   Expected: priority/{a,b}/$more_files, priority/c\n \n test_setup_9f () {\n-\ttest_create_repo 9f &&\n+\tgit init 9f &&\n \t(\n \t\tcd 9f &&\n \n@@ -3027,7 +3027,7 @@ test_expect_success '9f: Renamed directory that only contained immediate subdirs\n # viewpoint...\n \n test_setup_9g () {\n-\ttest_create_repo 9g &&\n+\tgit init 9g &&\n \t(\n \t\tcd 9g &&\n \n@@ -3096,7 +3096,7 @@ test_expect_failure '9g: Renamed directory that only contained immediate subdirs\n #   NOTE: If we applied the z/ -> y/ rename to z/d, then we'd end up with\n #         a rename/rename(1to2) conflict (z/d -> y/d vs. x/d)\n test_setup_9h () {\n-\ttest_create_repo 9h &&\n+\tgit init 9h &&\n \t(\n \t\tcd 9h &&\n \n@@ -3177,7 +3177,7 @@ test_expect_success '9h: Avoid dir rename on merely modified path' '\n #       ERROR_MSG(untracked working tree files would be overwritten by merge)\n \n test_setup_10a () {\n-\ttest_create_repo 10a &&\n+\tgit init 10a &&\n \t(\n \t\tcd 10a &&\n \n@@ -3243,7 +3243,7 @@ test_expect_success '10a: Overwrite untracked with normal rename/delete' '\n #       ERROR_MSG(refusing to lose untracked file at 'y/d')\n \n test_setup_10b () {\n-\ttest_create_repo 10b &&\n+\tgit init 10b &&\n \t(\n \t\tcd 10b &&\n \n@@ -3334,7 +3334,7 @@ test_expect_success '10b: Overwrite untracked with dir rename + delete' '\n #             ERROR_MSG(Refusing to lose untracked file at y/c)\n \n test_setup_10c () {\n-\ttest_create_repo 10c_$1 &&\n+\tgit init 10c_$1 &&\n \t(\n \t\tcd 10c_$1 &&\n \n@@ -3472,7 +3472,7 @@ test_expect_success '10c2: Overwrite untracked with dir rename/rename(1to2), oth\n #             ERROR_MSG(Refusing to lose untracked file at y/wham)\n \n test_setup_10d () {\n-\ttest_create_repo 10d &&\n+\tgit init 10d &&\n \t(\n \t\tcd 10d &&\n \n@@ -3568,7 +3568,7 @@ test_expect_success '10d: Delete untracked with dir rename/rename(2to1)' '\n #   Expected: y/{a,b,c} + untracked z/c\n \n test_setup_10e () {\n-\ttest_create_repo 10e &&\n+\tgit init 10e &&\n \t(\n \t\tcd 10e &&\n \n@@ -3650,7 +3650,7 @@ test_expect_merge_algorithm failure success '10e: Does git complain about untrac\n #             z/c with uncommitted mods on top of A:z/c_v1\n \n test_setup_11a () {\n-\ttest_create_repo 11a &&\n+\tgit init 11a &&\n \t(\n \t\tcd 11a &&\n \n@@ -3728,7 +3728,7 @@ test_expect_success '11a: Avoid losing dirty contents with simple rename' '\n \n \n test_setup_11b () {\n-\ttest_create_repo 11b &&\n+\tgit init 11b &&\n \t(\n \t\tcd 11b &&\n \n@@ -3810,7 +3810,7 @@ test_expect_success '11b: Avoid losing dirty file involved in directory rename'\n #             y/c left untouched (still has uncommitted mods)\n \n test_setup_11c () {\n-\ttest_create_repo 11c &&\n+\tgit init 11c &&\n \t(\n \t\tcd 11c &&\n \n@@ -3883,7 +3883,7 @@ test_expect_success '11c: Avoid losing not-uptodate with rename + D/F conflict'\n #             y/{a,c~HEAD,c/d}, x/b, now-untracked z/c_v1 with uncommitted mods\n \n test_setup_11d () {\n-\ttest_create_repo 11d &&\n+\tgit init 11d &&\n \t(\n \t\tcd 11d &&\n \n@@ -3968,7 +3968,7 @@ test_expect_success '11d: Avoid losing not-uptodate with rename + D/F conflict'\n #             y/c has dirty file from before merge\n \n test_setup_11e () {\n-\ttest_create_repo 11e &&\n+\tgit init 11e &&\n \t(\n \t\tcd 11e &&\n \n@@ -4060,7 +4060,7 @@ test_expect_success '11e: Avoid deleting not-uptodate with dir rename/rename(1to\n #             ERROR_MSG(Refusing to lose dirty file at y/wham)\n \n test_setup_11f () {\n-\ttest_create_repo 11f &&\n+\tgit init 11f &&\n \t(\n \t\tcd 11f &&\n \n@@ -4155,7 +4155,7 @@ test_expect_success '11f: Avoid deleting not-uptodate with dir rename/rename(2to\n #   Expected: node1/{leaf1,leaf2,leaf5,node2/{leaf3,leaf4,leaf6}}\n \n test_setup_12a () {\n-\ttest_create_repo 12a &&\n+\tgit init 12a &&\n \t(\n \t\tcd 12a &&\n \n@@ -4238,7 +4238,7 @@ test_expect_success '12a: Moving one directory hierarchy into another' '\n #             node2/node1/{leaf1, leaf2}\n \n test_setup_12b1 () {\n-\ttest_create_repo 12b1 &&\n+\tgit init 12b1 &&\n \t(\n \t\tcd 12b1 &&\n \n@@ -4327,7 +4327,7 @@ test_expect_merge_algorithm failure success '12b1: Moving two directory hierarch\n #         even simple rules give weird results when given weird inputs.\n \n test_setup_12b2 () {\n-\ttest_create_repo 12b2 &&\n+\tgit init 12b2 &&\n \t(\n \t\tcd 12b2 &&\n \n@@ -4402,7 +4402,7 @@ test_expect_success '12b2: Moving two directory hierarchies into each other' '\n #         each side of the merge.\n \n test_setup_12c1 () {\n-\ttest_create_repo 12c1 &&\n+\tgit init 12c1 &&\n \t(\n \t\tcd 12c1 &&\n \n@@ -4492,7 +4492,7 @@ test_expect_merge_algorithm failure success '12c1: Moving one directory hierarch\n #         on each side of the merge.\n \n test_setup_12c2 () {\n-\ttest_create_repo 12c2 &&\n+\tgit init 12c2 &&\n \t(\n \t\tcd 12c2 &&\n \n@@ -4584,7 +4584,7 @@ test_expect_success '12c2: Moving one directory hierarchy into another w/ conten\n #   Expected: subdir/foo, bar\n \n test_setup_12d () {\n-\ttest_create_repo 12d &&\n+\tgit init 12d &&\n \t(\n \t\tcd 12d &&\n \n@@ -4642,7 +4642,7 @@ test_expect_success '12d: Rename/merge subdir into the root, variant 1' '\n #   Expected: foo, bar\n \n test_setup_12e () {\n-\ttest_create_repo 12e &&\n+\tgit init 12e &&\n \t(\n \t\tcd 12e &&\n \n@@ -4743,7 +4743,7 @@ test_expect_success '12e: Rename/merge subdir into the root, variant 2' '\n #      pick and re-applying them in the subsequent one.\n \n test_setup_12f () {\n-\ttest_create_repo 12f &&\n+\tgit init 12f &&\n \t(\n \t\tcd 12f &&\n \n@@ -4902,7 +4902,7 @@ test_expect_merge_algorithm failure success '12f: Trivial directory resolve, cac\n #   Expected: newfile_{merged}, newdir/{a_B,b_B,c_A}\n \n test_setup_12g () {\n-\ttest_create_repo 12g &&\n+\tgit init 12g &&\n \t(\n \t\tcd 12g &&\n \n@@ -4973,7 +4973,7 @@ test_expect_success '12g: Testcase with two kinds of \"relevant\" renames' '\n #   Expected: newdir/{alpha_2, b}\n \n test_setup_12h () {\n-\ttest_create_repo 12h &&\n+\tgit init 12h &&\n \t(\n \t\tcd 12h &&\n \n@@ -5032,7 +5032,7 @@ test_expect_failure '12h: renaming a file within a renamed directory' '\n #                source/bar vs. source/subdir/bar\n \n test_setup_12i () {\n-\ttest_create_repo 12i &&\n+\tgit init 12i &&\n \t(\n \t\tcd 12i &&\n \n@@ -5090,7 +5090,7 @@ test_expect_success '12i: Directory rename causes rename-to-self' '\n #   Expected: {foo, bar, baz_2}, with conflicts on bar vs. subdir/bar\n \n test_setup_12j () {\n-\ttest_create_repo 12j &&\n+\tgit init 12j &&\n \t(\n \t\tcd 12j &&\n \n@@ -5148,7 +5148,7 @@ test_expect_success '12j: Directory rename to root causes rename-to-self' '\n #   Expected: dirA/{foo, bar, baz_2}, with conflicts on dirA/bar vs. dirB/bar\n \n test_setup_12k () {\n-\ttest_create_repo 12k &&\n+\tgit init 12k &&\n \t(\n \t\tcd 12k &&\n \n@@ -5218,7 +5218,7 @@ test_expect_success '12k: Directory rename with sibling causes rename-to-self' '\n #   is needed for there to be a sub1/ -> sub3/ rename.\n \n test_setup_12l () {\n-\ttest_create_repo 12l_$1 &&\n+\tgit init 12l_$1 &&\n \t(\n \t\tcd 12l_$1 &&\n \n@@ -5322,7 +5322,7 @@ test_expect_merge_algorithm failure success '12l (A into B): Rename into each ot\n #   Expected: y/{b,c,d,e/f}, with notices/conflicts for both y/d and y/e/f\n \n test_setup_13a () {\n-\ttest_create_repo 13a_$1 &&\n+\tgit init 13a_$1 &&\n \t(\n \t\tcd 13a_$1 &&\n \n@@ -5409,7 +5409,7 @@ test_expect_success '13a(info): messages for newly added files' '\n #             one about content, and one about file location\n \n test_setup_13b () {\n-\ttest_create_repo 13b_$1 &&\n+\tgit init 13b_$1 &&\n \t(\n \t\tcd 13b_$1 &&\n \n@@ -5496,7 +5496,7 @@ test_expect_success '13b(info): messages for transitive rename with conflicted c\n #             shown in testcase 13d.\n \n test_setup_13c () {\n-\ttest_create_repo 13c_$1 &&\n+\tgit init 13c_$1 &&\n \t(\n \t\tcd 13c_$1 &&\n \n@@ -5584,7 +5584,7 @@ test_expect_success '13c(info): messages for rename/rename(1to1) via transitive\n #               No conflict in where a/y ends up, so put it in d/y.\n \n test_setup_13d () {\n-\ttest_create_repo 13d_$1 &&\n+\tgit init 13d_$1 &&\n \t(\n \t\tcd 13d_$1 &&\n \n@@ -5710,7 +5710,7 @@ test_expect_success '13d(info): messages for rename/rename(1to1) via dual transi\n #          least avoids hitting a BUG().\n #\n test_setup_13e () {\n-\ttest_create_repo 13e &&\n+\tgit init 13e &&\n \t(\n \t\tcd 13e &&\n \ndiff --git a/t/t6426-merge-skip-unneeded-updates.sh b/t/t6426-merge-skip-unneeded-updates.sh\nindex 7b5f1c1dcd1..2bb8e7f09bb 100755\n--- a/t/t6426-merge-skip-unneeded-updates.sh\n+++ b/t/t6426-merge-skip-unneeded-updates.sh\n@@ -38,7 +38,7 @@ test_description=\"merge cases\"\n #   Expected: b_2\n \n test_setup_1a () {\n-\ttest_create_repo 1a_$1 &&\n+\tgit init 1a_$1 &&\n \t(\n \t\tcd 1a_$1 &&\n \n@@ -136,7 +136,7 @@ test_expect_success '1a-R: Modify(A)/Modify(B), change on B subset of A' '\n #   Expected: c_2\n \n test_setup_2a () {\n-\ttest_create_repo 2a_$1 &&\n+\tgit init 2a_$1 &&\n \t(\n \t\tcd 2a_$1 &&\n \n@@ -229,7 +229,7 @@ test_expect_success '2a-R: Modify/rename, merge into rename side' '\n #   Expected: c_2\n \n test_setup_2b () {\n-\ttest_create_repo 2b_$1 &&\n+\tgit init 2b_$1 &&\n \t(\n \t\tcd 2b_$1 &&\n \n@@ -336,7 +336,7 @@ test_expect_success '2b-R: Rename+Mod(A)/Mod(B), B mods subset of A' '\n #         not make that particular mistake.\n \n test_setup_2c () {\n-\ttest_create_repo 2c &&\n+\tgit init 2c &&\n \t(\n \t\tcd 2c &&\n \n@@ -437,7 +437,7 @@ test_expect_success '2c: Modify b & add c VS rename b->c' '\n #   Expected: bar/{bq_2, whatever}\n \n test_setup_3a () {\n-\ttest_create_repo 3a_$1 &&\n+\tgit init 3a_$1 &&\n \t(\n \t\tcd 3a_$1 &&\n \n@@ -537,7 +537,7 @@ test_expect_success '3a-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' '\n #   Expected: bar/{bq_2, whatever}\n \n test_setup_3b () {\n-\ttest_create_repo 3b_$1 &&\n+\tgit init 3b_$1 &&\n \t(\n \t\tcd 3b_$1 &&\n \n@@ -642,7 +642,7 @@ test_expect_success '3b-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' '\n #   Expected: b_2 for merge, b_4 in working copy\n \n test_setup_4a () {\n-\ttest_create_repo 4a &&\n+\tgit init 4a &&\n \t(\n \t\tcd 4a &&\n \n@@ -714,7 +714,7 @@ test_expect_merge_algorithm failure success '4a: Change on A, change on B subset\n #   Expected: c_2\n \n test_setup_4b () {\n-\ttest_create_repo 4b &&\n+\tgit init 4b &&\n \t(\n \t\tcd 4b &&\n \ndiff --git a/t/t6427-diff3-conflict-markers.sh b/t/t6427-diff3-conflict-markers.sh\nindex a9ee4cb207a..dd5fe6a4021 100755\n--- a/t/t6427-diff3-conflict-markers.sh\n+++ b/t/t6427-diff3-conflict-markers.sh\n@@ -19,7 +19,7 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n #\n \n test_expect_success 'setup no merge base' '\n-\ttest_create_repo no_merge_base &&\n+\tgit init no_merge_base &&\n \t(\n \t\tcd no_merge_base &&\n \n@@ -55,7 +55,7 @@ test_expect_success 'check no merge base' '\n #\n \n test_expect_success 'setup unique merge base' '\n-\ttest_create_repo unique_merge_base &&\n+\tgit init unique_merge_base &&\n \t(\n \t\tcd unique_merge_base &&\n \n@@ -116,7 +116,7 @@ test_expect_success 'check unique merge base' '\n #\n \n test_expect_success 'setup multiple merge bases' '\n-\ttest_create_repo multiple_merge_bases &&\n+\tgit init multiple_merge_bases &&\n \t(\n \t\tcd multiple_merge_bases &&\n \n@@ -190,7 +190,7 @@ test_expect_success 'check multiple merge bases' '\n '\n \n test_expect_success 'rebase --merge describes parent of commit being picked' '\n-\ttest_create_repo rebase &&\n+\tgit init rebase &&\n \t(\n \t\tcd rebase &&\n \t\ttest_commit base file &&\n@@ -212,7 +212,7 @@ test_expect_success 'rebase --apply describes fake ancestor base' '\n '\n \n test_setup_zdiff3 () {\n-\ttest_create_repo zdiff3 &&\n+\tgit init zdiff3 &&\n \t(\n \t\tcd zdiff3 &&\n \ndiff --git a/t/t6428-merge-conflicts-sparse.sh b/t/t6428-merge-conflicts-sparse.sh\nindex 064be1b629e..9919c3fa7cd 100755\n--- a/t/t6428-merge-conflicts-sparse.sh\n+++ b/t/t6428-merge-conflicts-sparse.sh\n@@ -29,7 +29,7 @@ test_description=\"merge cases\"\n # Testcase basic, conflicting changes in 'numerals'\n \n test_setup_numerals () {\n-\ttest_create_repo numerals_$1 &&\n+\tgit init numerals_$1 &&\n \t(\n \t\tcd numerals_$1 &&\n \ndiff --git a/t/t6429-merge-sequence-rename-caching.sh b/t/t6429-merge-sequence-rename-caching.sh\nindex e1ce9199164..7a630d970c6 100755\n--- a/t/t6429-merge-sequence-rename-caching.sh\n+++ b/t/t6429-merge-sequence-rename-caching.sh\n@@ -35,7 +35,7 @@ test_description=\"remember regular & dir renames in sequence of merges\"\n # preventing us from finding new renames.\n #\n test_expect_success 'caching renames does not preclude finding new ones' '\n-\ttest_create_repo caching-renames-and-new-renames &&\n+\tgit init caching-renames-and-new-renames &&\n \t(\n \t\tcd caching-renames-and-new-renames &&\n \n@@ -106,7 +106,7 @@ test_expect_success 'caching renames does not preclude finding new ones' '\n # should be able to only run rename detection on the upstream side one\n # time.)\n test_expect_success 'cherry-pick both a commit and its immediate revert' '\n-\ttest_create_repo pick-commit-and-its-immediate-revert &&\n+\tgit init pick-commit-and-its-immediate-revert &&\n \t(\n \t\tcd pick-commit-and-its-immediate-revert &&\n \n@@ -162,7 +162,7 @@ test_expect_success 'cherry-pick both a commit and its immediate revert' '\n # could cause a spurious rename/add conflict.\n #\n test_expect_success 'rename same file identically, then reintroduce it' '\n-\ttest_create_repo rename-rename-1to1-then-add-old-filename &&\n+\tgit init rename-rename-1to1-then-add-old-filename &&\n \t(\n \t\tcd rename-rename-1to1-then-add-old-filename &&\n \n@@ -229,7 +229,7 @@ test_expect_success 'rename same file identically, then reintroduce it' '\n # cached, the directory rename could put newfile in the wrong directory.\n #\n test_expect_success 'rename same file identically, then add file to old dir' '\n-\ttest_create_repo rename-rename-1to1-then-add-file-to-old-dir &&\n+\tgit init rename-rename-1to1-then-add-file-to-old-dir &&\n \t(\n \t\tcd rename-rename-1to1-then-add-file-to-old-dir &&\n \n@@ -311,7 +311,7 @@ test_expect_success 'rename same file identically, then add file to old dir' '\n # should avoid the need to re-detect upstream renames.)\n #\n test_expect_success 'cached dir rename does not prevent noticing later conflict' '\n-\ttest_create_repo dir-rename-cache-not-occluding-later-conflict &&\n+\tgit init dir-rename-cache-not-occluding-later-conflict &&\n \t(\n \t\tcd dir-rename-cache-not-occluding-later-conflict &&\n \n@@ -365,7 +365,7 @@ test_expect_success 'cached dir rename does not prevent noticing later conflict'\n \n # Helper for the next two tests\n test_setup_upstream_rename () {\n-\ttest_create_repo $1 &&\n+\tgit init $1 &&\n \t(\n \t\tcd $1 &&\n \n@@ -537,7 +537,7 @@ test_expect_success 'dir rename unneeded, then rename existing file into old dir\n \n # Helper for the next two tests\n test_setup_topic_rename () {\n-\ttest_create_repo $1 &&\n+\tgit init $1 &&\n \t(\n \t\tcd $1 &&\n \ndiff --git a/t/t6437-submodule-merge.sh b/t/t6437-submodule-merge.sh\nindex c253bf759ab..744c7b8bf87 100755\n--- a/t/t6437-submodule-merge.sh\n+++ b/t/t6437-submodule-merge.sh\n@@ -310,7 +310,7 @@ test_expect_success 'recursive merge with submodule' '\n #   Expected: path/ is submodule and file contents for B's path are somewhere\n \n test_expect_success 'setup file/submodule conflict' '\n-\ttest_create_repo file-submodule &&\n+\tgit init file-submodule &&\n \t(\n \t\tcd file-submodule &&\n \n@@ -325,7 +325,7 @@ test_expect_success 'setup file/submodule conflict' '\n \t\tgit commit -m B &&\n \n \t\tgit checkout A &&\n-\t\ttest_create_repo path &&\n+\t\tgit init path &&\n \t\ttest_commit -C path world &&\n \t\tgit submodule add ./path &&\n \t\tgit commit -m A\n@@ -385,7 +385,7 @@ test_expect_success 'file/submodule conflict; merge --abort works afterward' '\n #     under the submodule to be treated as untracked or in the way.\n \n test_expect_success 'setup directory/submodule conflict' '\n-\ttest_create_repo directory-submodule &&\n+\tgit init directory-submodule &&\n \t(\n \t\tcd directory-submodule &&\n \n@@ -408,7 +408,7 @@ test_expect_success 'setup directory/submodule conflict' '\n \t\tgit commit -m B2 &&\n \n \t\tgit checkout A &&\n-\t\ttest_create_repo path &&\n+\t\tgit init path &&\n \t\ttest_commit -C path hello world &&\n \t\tgit submodule add ./path &&\n \t\tgit commit -m A\n\nbase-commit: 6a475b71f8c4ce708d69fdc9317aefbde3769e25\n-- \ngitgitgadget\n"},{"id":"461752","messageId":"3pso553o-rr64-9412-n1q3-q2n457r51448@tzk.qr","threadId":"58337","inReplyTo":"pull.1303.git.git.1661034837118.gitgitgadget@gmail.com","subject":"Re: [PATCH] t64??: convert 'test_create_repo' to 'git init'","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2022-08-22T12:46:05Z","receivedAt":"2022-08-22T12:46:13Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Elijah,\n\nOn Sat, 20 Aug 2022, Elijah Newren via GitGitGadget wrote:\n\n> From: Elijah Newren <newren@gmail.com>\n>\n> As promised[1], convert the merge-specific tests over to using 'git\n> init' instead of 'test_create_repo'.\n>\n> [1] https://lore.kernel.org/git/CABPp-BEcojvfeuhp7rSi-O+9oEu4KpwPDwbKS-MiD1qCKde-CA@mail.gmail.com/\n>\n> Signed-off-by: Elijah Newren <newren@gmail.com>\n\nLarge patch, but easy to review, and the commit message is clear (and\ndespite being short, follows the structure outlined in\nhttps://github.blog/2022-06-30-write-better-commits-build-better-projects/:\nIntent, Context, Implementation and Justification).\n\nReviewed-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n\nThank you,\nDscho\n"},{"id":"461974","messageId":"pull.1303.v2.git.git.1661485759789.gitgitgadget@gmail.com","threadId":"58337","inReplyTo":"pull.1303.git.git.1661034837118.gitgitgadget@gmail.com","subject":"[PATCH v2] t64xx: convert 'test_create_repo' to 'git init'","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2022-08-26T03:49:19Z","receivedAt":"2022-08-26T03:49:30Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren <newren@gmail.com>\n\nConvert the merge-specific tests (those in the t64xx range) over to\nusing 'git init' instead of 'test_create_repo'.\n\nReviewed-by: Johannes Schindelin <johannes.schindelin@gmx.de>\nSigned-off-by: Elijah Newren <newren@gmail.com>\n---\n    t64xx: convert 'test_create_repo' to 'git init'\n    \n    As promised[1].\n    \n    This patch merges cleanly with main & next & seen, and there are no\n    current in-flight topics that add a test_create_repo call to the t64xx\n    range of tests. This patch also gets rid of 37% of the test_create_repo\n    calls in the entire testsuite.\n    \n    Changes since v1:\n    \n     * Tweaked commit message\n     * Added Dscho's Reviewed-by\n    \n    [1]\n    https://lore.kernel.org/git/CABPp-BEcojvfeuhp7rSi-O+9oEu4KpwPDwbKS-MiD1qCKde-CA@mail.gmail.com/\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1303%2Fnewren%2Fnuke_test_create_repo_in_merge_tests-v2\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1303/newren/nuke_test_create_repo_in_merge_tests-v2\nPull-Request: https://github.com/git/git/pull/1303\n\nRange-diff vs v1:\n\n 1:  ad1c38cc1eb ! 1:  cd2ebd98e3c t64??: convert 'test_create_repo' to 'git init'\n     @@ Metadata\n      Author: Elijah Newren <newren@gmail.com>\n      \n       ## Commit message ##\n     -    t64??: convert 'test_create_repo' to 'git init'\n     +    t64xx: convert 'test_create_repo' to 'git init'\n      \n     -    As promised[1], convert the merge-specific tests over to using 'git\n     -    init' instead of 'test_create_repo'.\n     -\n     -    [1] https://lore.kernel.org/git/CABPp-BEcojvfeuhp7rSi-O+9oEu4KpwPDwbKS-MiD1qCKde-CA@mail.gmail.com/\n     +    Convert the merge-specific tests (those in the t64xx range) over to\n     +    using 'git init' instead of 'test_create_repo'.\n      \n     +    Reviewed-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n          Signed-off-by: Elijah Newren <newren@gmail.com>\n      \n       ## t/t6400-merge-df.sh ##\n\n\n t/t6400-merge-df.sh                      |   2 +-\n t/t6406-merge-attr.sh                    |   4 +-\n t/t6416-recursive-corner-cases.sh        |  38 +++----\n t/t6421-merge-partial-clone.sh           |   2 +-\n t/t6422-merge-rename-corner-cases.sh     |  38 +++----\n t/t6423-merge-rename-directories.sh      | 138 +++++++++++------------\n t/t6426-merge-skip-unneeded-updates.sh   |  16 +--\n t/t6427-diff3-conflict-markers.sh        |  10 +-\n t/t6428-merge-conflicts-sparse.sh        |   2 +-\n t/t6429-merge-sequence-rename-caching.sh |  14 +--\n t/t6437-submodule-merge.sh               |   8 +-\n 11 files changed, 136 insertions(+), 136 deletions(-)\n\ndiff --git a/t/t6400-merge-df.sh b/t/t6400-merge-df.sh\nindex 57a67cf3627..3de4ef6bd9e 100755\n--- a/t/t6400-merge-df.sh\n+++ b/t/t6400-merge-df.sh\n@@ -126,7 +126,7 @@ test_expect_success 'Simple merge in repo with interesting pathnames' '\n \t#     foo/bar-2/baz\n \t# The fact that foo/bar-2 appears between foo/bar and foo/bar/baz\n \t# can trip up some codepaths, and is the point of this test.\n-\ttest_create_repo name-ordering &&\n+\tgit init name-ordering &&\n \t(\n \t\tcd name-ordering &&\n \ndiff --git a/t/t6406-merge-attr.sh b/t/t6406-merge-attr.sh\nindex 99abefd44b9..8650a88c40a 100755\n--- a/t/t6406-merge-attr.sh\n+++ b/t/t6406-merge-attr.sh\n@@ -162,8 +162,8 @@ test_expect_success 'custom merge backend' '\n '\n \n test_expect_success 'up-to-date merge without common ancestor' '\n-\ttest_create_repo repo1 &&\n-\ttest_create_repo repo2 &&\n+\tgit init repo1 &&\n+\tgit init repo2 &&\n \ttest_tick &&\n \t(\n \t\tcd repo1 &&\ndiff --git a/t/t6416-recursive-corner-cases.sh b/t/t6416-recursive-corner-cases.sh\nindex 690c8482b13..17b54d625d0 100755\n--- a/t/t6416-recursive-corner-cases.sh\n+++ b/t/t6416-recursive-corner-cases.sh\n@@ -19,7 +19,7 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n #\n \n test_expect_success 'setup basic criss-cross + rename with no modifications' '\n-\ttest_create_repo basic-rename &&\n+\tgit init basic-rename &&\n \t(\n \t\tcd basic-rename &&\n \n@@ -85,7 +85,7 @@ test_expect_success 'merge simple rename+criss-cross with no modifications' '\n #\n \n test_expect_success 'setup criss-cross + rename merges with basic modification' '\n-\ttest_create_repo rename-modify &&\n+\tgit init rename-modify &&\n \t(\n \t\tcd rename-modify &&\n \n@@ -160,7 +160,7 @@ test_expect_success 'merge criss-cross + rename merges with basic modification'\n #\n \n test_expect_success 'setup differently handled merges of rename/add conflict' '\n-\ttest_create_repo rename-add &&\n+\tgit init rename-add &&\n \t(\n \t\tcd rename-add &&\n \n@@ -324,7 +324,7 @@ test_expect_success 'git detects differently handled merges conflict, swapped' '\n # Merging commits D & E should result in modify/delete conflict.\n \n test_expect_success 'setup criss-cross + modify/delete resolved differently' '\n-\ttest_create_repo modify-delete &&\n+\tgit init modify-delete &&\n \t(\n \t\tcd modify-delete &&\n \n@@ -499,7 +499,7 @@ test_expect_success 'git detects conflict merging criss-cross+modify/delete, rev\n #\n \n test_expect_success 'setup differently handled merges of directory/file conflict' '\n-\ttest_create_repo directory-file &&\n+\tgit init directory-file &&\n \t(\n \t\tcd directory-file &&\n \n@@ -867,7 +867,7 @@ test_expect_failure 'merge of D2 & E4 merges a2s & reports conflict for a/file'\n # but that may cancel out at the final merge stage\".\n \n test_expect_success 'setup rename/rename(1to2)/modify followed by what looks like rename/rename(2to1)/modify' '\n-\ttest_create_repo rename-squared-squared &&\n+\tgit init rename-squared-squared &&\n \t(\n \t\tcd rename-squared-squared &&\n \n@@ -944,7 +944,7 @@ test_expect_success 'handle rename/rename(1to2)/modify followed by what looks li\n # content merge handled.\n \n test_expect_success 'setup criss-cross + rename/rename/add-source + modify/modify' '\n-\ttest_create_repo rename-rename-add-source &&\n+\tgit init rename-rename-add-source &&\n \t(\n \t\tcd rename-rename-add-source &&\n \n@@ -1032,7 +1032,7 @@ test_expect_failure 'detect rename/rename/add-source for virtual merge-base' '\n # base of B & C needs to not delete B:c for that to work, though...\n \n test_expect_success 'setup criss-cross+rename/rename/add-dest + simple modify' '\n-\ttest_create_repo rename-rename-add-dest &&\n+\tgit init rename-rename-add-dest &&\n \t(\n \t\tcd rename-rename-add-dest &&\n \n@@ -1111,7 +1111,7 @@ test_expect_success 'virtual merge base handles rename/rename(1to2)/add-dest' '\n # git detect it?\n \n test_expect_success 'setup symlink modify/modify' '\n-\ttest_create_repo symlink-modify-modify &&\n+\tgit init symlink-modify-modify &&\n \t(\n \t\tcd symlink-modify-modify &&\n \n@@ -1178,7 +1178,7 @@ test_expect_merge_algorithm failure success 'check symlink modify/modify' '\n # git detect it?\n \n test_expect_success 'setup symlink add/add' '\n-\ttest_create_repo symlink-add-add &&\n+\tgit init symlink-add-add &&\n \t(\n \t\tcd symlink-add-add &&\n \n@@ -1244,11 +1244,11 @@ test_expect_merge_algorithm failure success 'check symlink add/add' '\n # git detect it?\n \n test_expect_success 'setup submodule modify/modify' '\n-\ttest_create_repo submodule-modify-modify &&\n+\tgit init submodule-modify-modify &&\n \t(\n \t\tcd submodule-modify-modify &&\n \n-\t\ttest_create_repo submod &&\n+\t\tgit init submod &&\n \t\t(\n \t\t\tcd submod &&\n \t\t\ttouch file-A &&\n@@ -1332,11 +1332,11 @@ test_expect_merge_algorithm failure success 'check submodule modify/modify' '\n # git detect it?\n \n test_expect_success 'setup submodule add/add' '\n-\ttest_create_repo submodule-add-add &&\n+\tgit init submodule-add-add &&\n \t(\n \t\tcd submodule-add-add &&\n \n-\t\ttest_create_repo submod &&\n+\t\tgit init submod &&\n \t\t(\n \t\t\tcd submod &&\n \t\t\ttouch file-A &&\n@@ -1419,11 +1419,11 @@ test_expect_merge_algorithm failure success 'check submodule add/add' '\n # This is an obvious add/add conflict for 'path'.  Can git detect it?\n \n test_expect_success 'setup conflicting entry types (submodule vs symlink)' '\n-\ttest_create_repo submodule-symlink-add-add &&\n+\tgit init submodule-symlink-add-add &&\n \t(\n \t\tcd submodule-symlink-add-add &&\n \n-\t\ttest_create_repo path &&\n+\t\tgit init path &&\n \t\t(\n \t\t\tcd path &&\n \t\t\ttouch file-B &&\n@@ -1494,7 +1494,7 @@ test_expect_merge_algorithm failure success 'check conflicting entry types (subm\n # This is an obvious add/add mode conflict.  Can git detect it?\n \n test_expect_success 'setup conflicting modes for regular file' '\n-\ttest_create_repo regular-file-mode-conflict &&\n+\tgit init regular-file-mode-conflict &&\n \t(\n \t\tcd regular-file-mode-conflict &&\n \n@@ -1571,7 +1571,7 @@ test_expect_failure 'check conflicting modes for regular file' '\n #   to ensure that we handle it as well as practical.\n \n test_expect_success 'setup nested conflicts' '\n-\ttest_create_repo nested_conflicts &&\n+\tgit init nested_conflicts &&\n \t(\n \t\tcd nested_conflicts &&\n \n@@ -1757,7 +1757,7 @@ test_expect_success 'check nested conflicts' '\n #   have three levels of conflict markers.  Can we distinguish all three?\n \n test_expect_success 'setup virtual merge base with nested conflicts' '\n-\ttest_create_repo virtual_merge_base_has_nested_conflicts &&\n+\tgit init virtual_merge_base_has_nested_conflicts &&\n \t(\n \t\tcd virtual_merge_base_has_nested_conflicts &&\n \ndiff --git a/t/t6421-merge-partial-clone.sh b/t/t6421-merge-partial-clone.sh\nindex 36bcd7c3280..5413e5dd9d6 100755\n--- a/t/t6421-merge-partial-clone.sh\n+++ b/t/t6421-merge-partial-clone.sh\n@@ -31,7 +31,7 @@ test_description=\"limiting blob downloads when merging with partial clones\"\n \n test_setup_repo () {\n \ttest -d server && return\n-\ttest_create_repo server &&\n+\tgit init server &&\n \t(\n \t\tcd server &&\n \ndiff --git a/t/t6422-merge-rename-corner-cases.sh b/t/t6422-merge-rename-corner-cases.sh\nindex 9b65768aed6..346253c7c88 100755\n--- a/t/t6422-merge-rename-corner-cases.sh\n+++ b/t/t6422-merge-rename-corner-cases.sh\n@@ -11,7 +11,7 @@ TEST_PASSES_SANITIZE_LEAK=true\n . \"$TEST_DIRECTORY\"/lib-merge.sh\n \n test_setup_rename_delete_untracked () {\n-\ttest_create_repo rename-delete-untracked &&\n+\tgit init rename-delete-untracked &&\n \t(\n \t\tcd rename-delete-untracked &&\n \n@@ -56,7 +56,7 @@ test_expect_success \"Does git preserve Gollum's precious artifact?\" '\n # We should be able to merge B & C cleanly\n \n test_setup_rename_modify_add_source () {\n-\ttest_create_repo rename-modify-add-source &&\n+\tgit init rename-modify-add-source &&\n \t(\n \t\tcd rename-modify-add-source &&\n \n@@ -96,7 +96,7 @@ test_expect_failure 'rename/modify/add-source conflict resolvable' '\n '\n \n test_setup_break_detection_1 () {\n-\ttest_create_repo break-detection-1 &&\n+\tgit init break-detection-1 &&\n \t(\n \t\tcd break-detection-1 &&\n \n@@ -144,7 +144,7 @@ test_expect_failure 'conflict caused if rename not detected' '\n '\n \n test_setup_break_detection_2 () {\n-\ttest_create_repo break-detection-2 &&\n+\tgit init break-detection-2 &&\n \t(\n \t\tcd break-detection-2 &&\n \n@@ -192,7 +192,7 @@ test_expect_failure 'missed conflict if rename not detected' '\n #   Commit C: rename a->b, add unrelated a\n \n test_setup_break_detection_3 () {\n-\ttest_create_repo break-detection-3 &&\n+\tgit init break-detection-3 &&\n \t(\n \t\tcd break-detection-3 &&\n \n@@ -268,7 +268,7 @@ test_expect_failure 'detect rename/add-source and preserve all data, merge other\n '\n \n test_setup_rename_directory () {\n-\ttest_create_repo rename-directory-$1 &&\n+\tgit init rename-directory-$1 &&\n \t(\n \t\tcd rename-directory-$1 &&\n \n@@ -386,7 +386,7 @@ test_expect_success 'rename/directory conflict + content merge conflict' '\n '\n \n test_setup_rename_directory_2 () {\n-\ttest_create_repo rename-directory-2 &&\n+\tgit init rename-directory-2 &&\n \t(\n \t\tcd rename-directory-2 &&\n \n@@ -445,7 +445,7 @@ test_expect_success 'disappearing dir in rename/directory conflict handled' '\n #   Commit B: modify a, add different b\n \n test_setup_rename_with_content_merge_and_add () {\n-\ttest_create_repo rename-with-content-merge-and-add-$1 &&\n+\tgit init rename-with-content-merge-and-add-$1 &&\n \t(\n \t\tcd rename-with-content-merge-and-add-$1 &&\n \n@@ -570,7 +570,7 @@ test_expect_success 'handle rename-with-content-merge vs. add, merge other way'\n #   * Nothing else should be present.  Is anything?\n \n test_setup_rename_rename_2to1 () {\n-\ttest_create_repo rename-rename-2to1 &&\n+\tgit init rename-rename-2to1 &&\n \t(\n \t\tcd rename-rename-2to1 &&\n \n@@ -642,7 +642,7 @@ test_expect_success 'handle rename/rename (2to1) conflict correctly' '\n #   Commit B: rename a->b\n #   Commit C: rename a->c\n test_setup_rename_rename_1to2 () {\n-\ttest_create_repo rename-rename-1to2 &&\n+\tgit init rename-rename-1to2 &&\n \t(\n \t\tcd rename-rename-1to2 &&\n \n@@ -700,7 +700,7 @@ test_expect_success 'merge has correct working tree contents' '\n # Merging of B & C should NOT be clean; there's a rename/rename conflict\n \n test_setup_rename_rename_1to2_add_source_1 () {\n-\ttest_create_repo rename-rename-1to2-add-source-1 &&\n+\tgit init rename-rename-1to2-add-source-1 &&\n \t(\n \t\tcd rename-rename-1to2-add-source-1 &&\n \n@@ -748,7 +748,7 @@ test_expect_failure 'detect conflict with rename/rename(1to2)/add-source merge'\n '\n \n test_setup_rename_rename_1to2_add_source_2 () {\n-\ttest_create_repo rename-rename-1to2-add-source-2 &&\n+\tgit init rename-rename-1to2-add-source-2 &&\n \t(\n \t\tcd rename-rename-1to2-add-source-2 &&\n \n@@ -794,7 +794,7 @@ test_expect_failure 'rename/rename/add-source still tracks new a file' '\n '\n \n test_setup_rename_rename_1to2_add_dest () {\n-\ttest_create_repo rename-rename-1to2-add-dest &&\n+\tgit init rename-rename-1to2-add-dest &&\n \t(\n \t\tcd rename-rename-1to2-add-dest &&\n \n@@ -874,7 +874,7 @@ test_expect_success 'rename/rename/add-dest merge still knows about conflicting\n #   Expected: CONFLICT (rename/add/delete), two-way merged bar\n \n test_setup_rad () {\n-\ttest_create_repo rad &&\n+\tgit init rad &&\n \t(\n \t\tcd rad &&\n \t\techo \"original file\" >foo &&\n@@ -946,7 +946,7 @@ test_expect_merge_algorithm failure success 'rad-check: rename/add/delete confli\n #   Expected: CONFLICT (rename/rename/delete/delete), two-way merged baz\n \n test_setup_rrdd () {\n-\ttest_create_repo rrdd &&\n+\tgit init rrdd &&\n \t(\n \t\tcd rrdd &&\n \t\techo foo >foo &&\n@@ -1022,7 +1022,7 @@ test_expect_merge_algorithm failure success 'rrdd-check: rename/rename(2to1)/del\n #             multi-way merged contents found in two, four, six\n \n test_setup_mod6 () {\n-\ttest_create_repo mod6 &&\n+\tgit init mod6 &&\n \t(\n \t\tcd mod6 &&\n \t\ttest_seq 11 19 >one &&\n@@ -1160,7 +1160,7 @@ test_conflicts_with_adds_and_renames() {\n \t#      tree\n \ttest_setup_collision_conflict () {\n \t#test_expect_success \"setup simple $sideL/$sideR conflict\" '\n-\t\ttest_create_repo simple_${sideL}_${sideR} &&\n+\t\tgit init simple_${sideL}_${sideR} &&\n \t\t(\n \t\t\tcd simple_${sideL}_${sideR} &&\n \n@@ -1308,7 +1308,7 @@ test_conflicts_with_adds_and_renames add    add\n #   So, we have four different conflicting files that all end up at path\n #   'three'.\n test_setup_nested_conflicts_from_rename_rename () {\n-\ttest_create_repo nested_conflicts_from_rename_rename &&\n+\tgit init nested_conflicts_from_rename_rename &&\n \t(\n \t\tcd nested_conflicts_from_rename_rename &&\n \n@@ -1417,7 +1417,7 @@ test_expect_success 'check nested conflicts from rename/rename(2to1)' '\n #   Expected: CONFLICT(rename/rename) message, three unstaged entries in the\n #             index, and contents of orig-[AB] at path orig-[AB]\n test_setup_rename_rename_1_to_2_binary () {\n-\ttest_create_repo rename_rename_1_to_2_binary &&\n+\tgit init rename_rename_1_to_2_binary &&\n \t(\n \t\tcd rename_rename_1_to_2_binary &&\n \ndiff --git a/t/t6423-merge-rename-directories.sh b/t/t6423-merge-rename-directories.sh\nindex 99baf77cbfd..a4941878fe2 100755\n--- a/t/t6423-merge-rename-directories.sh\n+++ b/t/t6423-merge-rename-directories.sh\n@@ -40,7 +40,7 @@ test_description=\"recursive merge with directory renames\"\n #   Expected: y/{b,c,d,e/f}\n \n test_setup_1a () {\n-\ttest_create_repo 1a &&\n+\tgit init 1a &&\n \t(\n \t\tcd 1a &&\n \n@@ -106,7 +106,7 @@ test_expect_success '1a: Simple directory rename detection' '\n #   Expected: y/{b,c,d,e}\n \n test_setup_1b () {\n-\ttest_create_repo 1b &&\n+\tgit init 1b &&\n \t(\n \t\tcd 1b &&\n \n@@ -169,7 +169,7 @@ test_expect_success '1b: Merge a directory with another' '\n #   Expected: y/{b,c,d}  (because x/d -> z/d -> y/d)\n \n test_setup_1c () {\n-\ttest_create_repo 1c &&\n+\tgit init 1c &&\n \t(\n \t\tcd 1c &&\n \n@@ -232,7 +232,7 @@ test_expect_success '1c: Transitive renaming' '\n #         y/wham_1 & z/wham_2 should too...giving us a conflict.\n \n test_setup_1d () {\n-\ttest_create_repo 1d &&\n+\tgit init 1d &&\n \t(\n \t\tcd 1d &&\n \n@@ -328,7 +328,7 @@ test_expect_success '1d: Directory renames cause a rename/rename(2to1) conflict'\n #   Expected: y/{newb,newc,d}\n \n test_setup_1e () {\n-\ttest_create_repo 1e &&\n+\tgit init 1e &&\n \t(\n \t\tcd 1e &&\n \n@@ -387,7 +387,7 @@ test_expect_success '1e: Renamed directory, with all files being renamed too' '\n #   Expected: y/{b,c}, x/{d,e,f,g}\n \n test_setup_1f () {\n-\ttest_create_repo 1f &&\n+\tgit init 1f &&\n \t(\n \t\tcd 1f &&\n \n@@ -476,7 +476,7 @@ test_expect_success '1f: Split a directory into two other directories' '\n #   Commit B: z/{b,c,d}\n #   Expected: y/b, w/c, z/d, with warning about z/ -> (y/ vs. w/) conflict\n test_setup_2a () {\n-\ttest_create_repo 2a &&\n+\tgit init 2a &&\n \t(\n \t\tcd 2a &&\n \n@@ -538,7 +538,7 @@ test_expect_success '2a: Directory split into two on one side, with equal number\n #   Commit B: z/{b,c}, x/d\n #   Expected: y/b, w/c, x/d; No warning about z/ -> (y/ vs. w/) conflict\n test_setup_2b () {\n-\ttest_create_repo 2b &&\n+\tgit init 2b &&\n \t(\n \t\tcd 2b &&\n \n@@ -620,7 +620,7 @@ test_expect_success '2b: Directory split into two on one side, with equal number\n #   Commit B: y/{b,c}, x/d\n #   Expected: y/{b,c}, x/d\n test_setup_3a () {\n-\ttest_create_repo 3a &&\n+\tgit init 3a &&\n \t(\n \t\tcd 3a &&\n \n@@ -684,7 +684,7 @@ test_expect_success '3a: Avoid implicit rename if involved as source on other si\n #         end up with CONFLICT:(z/d -> y/d vs. x/d vs. w/d), i.e. a\n #         rename/rename/rename(1to3) conflict, which is just weird.\n test_setup_3b () {\n-\ttest_create_repo 3b &&\n+\tgit init 3b &&\n \t(\n \t\tcd 3b &&\n \n@@ -807,7 +807,7 @@ test_expect_success '3b: Avoid implicit rename if involved as source on current\n #   NOTE: Even though most files from z moved to y, we don't want f to follow.\n \n test_setup_4a () {\n-\ttest_create_repo 4a &&\n+\tgit init 4a &&\n \t(\n \t\tcd 4a &&\n \n@@ -896,7 +896,7 @@ test_expect_success '4a: Directory split, with original directory still present'\n #         index.\n \n test_setup_5a () {\n-\ttest_create_repo 5a &&\n+\tgit init 5a &&\n \t(\n \t\tcd 5a &&\n \n@@ -971,7 +971,7 @@ test_expect_success '5a: Merge directories, other side adds files to original an\n #         back to git behavior without the directory rename detection.\n \n test_setup_5b () {\n-\ttest_create_repo 5b &&\n+\tgit init 5b &&\n \t(\n \t\tcd 5b &&\n \n@@ -1048,7 +1048,7 @@ test_expect_success '5b: Rename/delete in order to get add/add/add conflict' '\n #             though, because it doesn't have anything in the way.\n \n test_setup_5c () {\n-\ttest_create_repo 5c &&\n+\tgit init 5c &&\n \t(\n \t\tcd 5c &&\n \n@@ -1138,7 +1138,7 @@ test_expect_success '5c: Transitive rename would cause rename/rename/rename/add/\n #         directory rename detection for z/f -> y/f.\n \n test_setup_5d () {\n-\ttest_create_repo 5d &&\n+\tgit init 5d &&\n \t(\n \t\tcd 5d &&\n \n@@ -1239,7 +1239,7 @@ test_expect_success '5d: Directory/file/file conflict due to directory rename' '\n #         it is also involved in a rename/delete conflict.\n \n test_setup_6a () {\n-\ttest_create_repo 6a &&\n+\tgit init 6a &&\n \t(\n \t\tcd 6a &&\n \n@@ -1337,7 +1337,7 @@ test_expect_success '6a: Tricky rename/delete' '\n #         the behavior on testcases 6b2 and 8e, and introduced this 6b1 testcase.\n \n test_setup_6b1 () {\n-\ttest_create_repo 6b1 &&\n+\tgit init 6b1 &&\n \t(\n \t\tcd 6b1 &&\n \n@@ -1415,7 +1415,7 @@ test_expect_merge_algorithm failure success '6b1: Same renames done on both side\n #         the z/ -> y/ rename.\n \n test_setup_6b2 () {\n-\ttest_create_repo 6b2 &&\n+\tgit init 6b2 &&\n \t(\n \t\tcd 6b2 &&\n \n@@ -1479,7 +1479,7 @@ test_expect_merge_algorithm failure success '6b2: Same rename done on both sides\n #         \"accidentally detect a rename\" and give us y/{b,c,d}.\n \n test_setup_6c () {\n-\ttest_create_repo 6c &&\n+\tgit init 6c &&\n \t(\n \t\tcd 6c &&\n \n@@ -1542,7 +1542,7 @@ test_expect_success '6c: Rename only done on same side' '\n #         doesn't \"accidentally detect a rename\" and give us y/{b,c,d}.\n \n test_setup_6d () {\n-\ttest_create_repo 6d &&\n+\tgit init 6d &&\n \t(\n \t\tcd 6d &&\n \n@@ -1605,7 +1605,7 @@ test_expect_success '6d: We do not always want transitive renaming' '\n #         add/add conflict on y/d_1 vs y/d_2.\n \n test_setup_6e () {\n-\ttest_create_repo 6e &&\n+\tgit init 6e &&\n \t(\n \t\tcd 6e &&\n \n@@ -1700,7 +1700,7 @@ test_expect_success '6e: Add/add from one side' '\n #   NOTE: There's a rename of z/ here, y/ has more renames, so z/d -> y/d.\n \n test_setup_7a () {\n-\ttest_create_repo 7a &&\n+\tgit init 7a &&\n \t(\n \t\tcd 7a &&\n \n@@ -1772,7 +1772,7 @@ test_expect_success '7a: rename-dir vs. rename-dir (NOT split evenly) PLUS add-o\n #   Expected: y/{b,c}, CONFLICT(rename/rename(2to1): x/d_1, w/d_2 -> y_d)\n \n test_setup_7b () {\n-\ttest_create_repo 7b &&\n+\tgit init 7b &&\n \t(\n \t\tcd 7b &&\n \n@@ -1861,7 +1861,7 @@ test_expect_success '7b: rename/rename(2to1), but only due to transitive rename'\n #         nor CONFLiCT x/d -> w/d vs. y/d vs. z/d)\n \n test_setup_7c () {\n-\ttest_create_repo 7c &&\n+\tgit init 7c &&\n \t(\n \t\tcd 7c &&\n \n@@ -1926,7 +1926,7 @@ test_expect_success '7c: rename/rename(1to...2or3); transitive rename may add co\n #   NOTE: z->y so NOT CONFLICT(delete x/d vs rename to z/d)\n \n test_setup_7d () {\n-\ttest_create_repo 7d &&\n+\tgit init 7d &&\n \t(\n \t\tcd 7d &&\n \n@@ -2027,7 +2027,7 @@ test_expect_success '7d: transitive rename involved in rename/delete; how is it\n #         how it's resolved.\n \n test_setup_7e () {\n-\ttest_create_repo 7e &&\n+\tgit init 7e &&\n \t(\n \t\tcd 7e &&\n \n@@ -2137,7 +2137,7 @@ test_expect_success '7e: transitive rename in rename/delete AND dirs in the way'\n # we potentially could.\n \n test_setup_8a () {\n-\ttest_create_repo 8a &&\n+\tgit init 8a &&\n \t(\n \t\tcd 8a &&\n \n@@ -2216,7 +2216,7 @@ test_expect_success '8a: Dual-directory rename, one into the others way' '\n # e_1 and e_2.\n \n test_setup_8b () {\n-\ttest_create_repo 8b &&\n+\tgit init 8b &&\n \t(\n \t\tcd 8b &&\n \n@@ -2290,7 +2290,7 @@ test_expect_success '8b: Dual-directory rename, one into the others way, with co\n #         notes in 8d.\n \n test_setup_8c () {\n-\ttest_create_repo 8c &&\n+\tgit init 8c &&\n \t(\n \t\tcd 8c &&\n \n@@ -2370,7 +2370,7 @@ test_expect_success '8c: modify/delete or rename+modify/delete' '\n #   differently.\n \n test_setup_8d () {\n-\ttest_create_repo 8d &&\n+\tgit init 8d &&\n \t(\n \t\tcd 8d &&\n \n@@ -2453,7 +2453,7 @@ test_expect_success '8d: rename/delete...or not?' '\n #        the behavior, and predict it without computing as many details.\n \n test_setup_8e () {\n-\ttest_create_repo 8e &&\n+\tgit init 8e &&\n \t(\n \t\tcd 8e &&\n \n@@ -2537,7 +2537,7 @@ test_expect_success '8e: Both sides rename, one side adds to original directory'\n #         of that could take the new file in commit B at z/i to x/w/i or x/i.\n \n test_setup_9a () {\n-\ttest_create_repo 9a &&\n+\tgit init 9a &&\n \t(\n \t\tcd 9a &&\n \n@@ -2609,7 +2609,7 @@ test_expect_success '9a: Inner renamed directory within outer renamed directory'\n #   Expected: y/{b,c,d_merged}\n \n test_setup_9b () {\n-\ttest_create_repo 9b &&\n+\tgit init 9b &&\n \t(\n \t\tcd 9b &&\n \n@@ -2697,7 +2697,7 @@ test_expect_success '9b: Transitive rename with content merge' '\n #         history for any implicit directory renames.\n \n test_setup_9c () {\n-\ttest_create_repo 9c &&\n+\tgit init 9c &&\n \t(\n \t\tcd 9c &&\n \n@@ -2786,7 +2786,7 @@ test_expect_success '9c: Doubly transitive rename?' '\n #   testcases and simplifies things for the user.\n \n test_setup_9d () {\n-\ttest_create_repo 9d &&\n+\tgit init 9d &&\n \t(\n \t\tcd 9d &&\n \n@@ -2861,7 +2861,7 @@ test_expect_success '9d: N-way transitive rename?' '\n #             dir1/yo, dir2/yo, dir3/yo, dirN/yo\n \n test_setup_9e () {\n-\ttest_create_repo 9e &&\n+\tgit init 9e &&\n \t(\n \t\tcd 9e &&\n \n@@ -2954,7 +2954,7 @@ test_expect_success '9e: N-to-1 whammo' '\n #   Expected: priority/{a,b}/$more_files, priority/c\n \n test_setup_9f () {\n-\ttest_create_repo 9f &&\n+\tgit init 9f &&\n \t(\n \t\tcd 9f &&\n \n@@ -3027,7 +3027,7 @@ test_expect_success '9f: Renamed directory that only contained immediate subdirs\n # viewpoint...\n \n test_setup_9g () {\n-\ttest_create_repo 9g &&\n+\tgit init 9g &&\n \t(\n \t\tcd 9g &&\n \n@@ -3096,7 +3096,7 @@ test_expect_failure '9g: Renamed directory that only contained immediate subdirs\n #   NOTE: If we applied the z/ -> y/ rename to z/d, then we'd end up with\n #         a rename/rename(1to2) conflict (z/d -> y/d vs. x/d)\n test_setup_9h () {\n-\ttest_create_repo 9h &&\n+\tgit init 9h &&\n \t(\n \t\tcd 9h &&\n \n@@ -3177,7 +3177,7 @@ test_expect_success '9h: Avoid dir rename on merely modified path' '\n #       ERROR_MSG(untracked working tree files would be overwritten by merge)\n \n test_setup_10a () {\n-\ttest_create_repo 10a &&\n+\tgit init 10a &&\n \t(\n \t\tcd 10a &&\n \n@@ -3243,7 +3243,7 @@ test_expect_success '10a: Overwrite untracked with normal rename/delete' '\n #       ERROR_MSG(refusing to lose untracked file at 'y/d')\n \n test_setup_10b () {\n-\ttest_create_repo 10b &&\n+\tgit init 10b &&\n \t(\n \t\tcd 10b &&\n \n@@ -3334,7 +3334,7 @@ test_expect_success '10b: Overwrite untracked with dir rename + delete' '\n #             ERROR_MSG(Refusing to lose untracked file at y/c)\n \n test_setup_10c () {\n-\ttest_create_repo 10c_$1 &&\n+\tgit init 10c_$1 &&\n \t(\n \t\tcd 10c_$1 &&\n \n@@ -3472,7 +3472,7 @@ test_expect_success '10c2: Overwrite untracked with dir rename/rename(1to2), oth\n #             ERROR_MSG(Refusing to lose untracked file at y/wham)\n \n test_setup_10d () {\n-\ttest_create_repo 10d &&\n+\tgit init 10d &&\n \t(\n \t\tcd 10d &&\n \n@@ -3568,7 +3568,7 @@ test_expect_success '10d: Delete untracked with dir rename/rename(2to1)' '\n #   Expected: y/{a,b,c} + untracked z/c\n \n test_setup_10e () {\n-\ttest_create_repo 10e &&\n+\tgit init 10e &&\n \t(\n \t\tcd 10e &&\n \n@@ -3650,7 +3650,7 @@ test_expect_merge_algorithm failure success '10e: Does git complain about untrac\n #             z/c with uncommitted mods on top of A:z/c_v1\n \n test_setup_11a () {\n-\ttest_create_repo 11a &&\n+\tgit init 11a &&\n \t(\n \t\tcd 11a &&\n \n@@ -3728,7 +3728,7 @@ test_expect_success '11a: Avoid losing dirty contents with simple rename' '\n \n \n test_setup_11b () {\n-\ttest_create_repo 11b &&\n+\tgit init 11b &&\n \t(\n \t\tcd 11b &&\n \n@@ -3810,7 +3810,7 @@ test_expect_success '11b: Avoid losing dirty file involved in directory rename'\n #             y/c left untouched (still has uncommitted mods)\n \n test_setup_11c () {\n-\ttest_create_repo 11c &&\n+\tgit init 11c &&\n \t(\n \t\tcd 11c &&\n \n@@ -3883,7 +3883,7 @@ test_expect_success '11c: Avoid losing not-uptodate with rename + D/F conflict'\n #             y/{a,c~HEAD,c/d}, x/b, now-untracked z/c_v1 with uncommitted mods\n \n test_setup_11d () {\n-\ttest_create_repo 11d &&\n+\tgit init 11d &&\n \t(\n \t\tcd 11d &&\n \n@@ -3968,7 +3968,7 @@ test_expect_success '11d: Avoid losing not-uptodate with rename + D/F conflict'\n #             y/c has dirty file from before merge\n \n test_setup_11e () {\n-\ttest_create_repo 11e &&\n+\tgit init 11e &&\n \t(\n \t\tcd 11e &&\n \n@@ -4060,7 +4060,7 @@ test_expect_success '11e: Avoid deleting not-uptodate with dir rename/rename(1to\n #             ERROR_MSG(Refusing to lose dirty file at y/wham)\n \n test_setup_11f () {\n-\ttest_create_repo 11f &&\n+\tgit init 11f &&\n \t(\n \t\tcd 11f &&\n \n@@ -4155,7 +4155,7 @@ test_expect_success '11f: Avoid deleting not-uptodate with dir rename/rename(2to\n #   Expected: node1/{leaf1,leaf2,leaf5,node2/{leaf3,leaf4,leaf6}}\n \n test_setup_12a () {\n-\ttest_create_repo 12a &&\n+\tgit init 12a &&\n \t(\n \t\tcd 12a &&\n \n@@ -4238,7 +4238,7 @@ test_expect_success '12a: Moving one directory hierarchy into another' '\n #             node2/node1/{leaf1, leaf2}\n \n test_setup_12b1 () {\n-\ttest_create_repo 12b1 &&\n+\tgit init 12b1 &&\n \t(\n \t\tcd 12b1 &&\n \n@@ -4327,7 +4327,7 @@ test_expect_merge_algorithm failure success '12b1: Moving two directory hierarch\n #         even simple rules give weird results when given weird inputs.\n \n test_setup_12b2 () {\n-\ttest_create_repo 12b2 &&\n+\tgit init 12b2 &&\n \t(\n \t\tcd 12b2 &&\n \n@@ -4402,7 +4402,7 @@ test_expect_success '12b2: Moving two directory hierarchies into each other' '\n #         each side of the merge.\n \n test_setup_12c1 () {\n-\ttest_create_repo 12c1 &&\n+\tgit init 12c1 &&\n \t(\n \t\tcd 12c1 &&\n \n@@ -4492,7 +4492,7 @@ test_expect_merge_algorithm failure success '12c1: Moving one directory hierarch\n #         on each side of the merge.\n \n test_setup_12c2 () {\n-\ttest_create_repo 12c2 &&\n+\tgit init 12c2 &&\n \t(\n \t\tcd 12c2 &&\n \n@@ -4584,7 +4584,7 @@ test_expect_success '12c2: Moving one directory hierarchy into another w/ conten\n #   Expected: subdir/foo, bar\n \n test_setup_12d () {\n-\ttest_create_repo 12d &&\n+\tgit init 12d &&\n \t(\n \t\tcd 12d &&\n \n@@ -4642,7 +4642,7 @@ test_expect_success '12d: Rename/merge subdir into the root, variant 1' '\n #   Expected: foo, bar\n \n test_setup_12e () {\n-\ttest_create_repo 12e &&\n+\tgit init 12e &&\n \t(\n \t\tcd 12e &&\n \n@@ -4743,7 +4743,7 @@ test_expect_success '12e: Rename/merge subdir into the root, variant 2' '\n #      pick and re-applying them in the subsequent one.\n \n test_setup_12f () {\n-\ttest_create_repo 12f &&\n+\tgit init 12f &&\n \t(\n \t\tcd 12f &&\n \n@@ -4902,7 +4902,7 @@ test_expect_merge_algorithm failure success '12f: Trivial directory resolve, cac\n #   Expected: newfile_{merged}, newdir/{a_B,b_B,c_A}\n \n test_setup_12g () {\n-\ttest_create_repo 12g &&\n+\tgit init 12g &&\n \t(\n \t\tcd 12g &&\n \n@@ -4973,7 +4973,7 @@ test_expect_success '12g: Testcase with two kinds of \"relevant\" renames' '\n #   Expected: newdir/{alpha_2, b}\n \n test_setup_12h () {\n-\ttest_create_repo 12h &&\n+\tgit init 12h &&\n \t(\n \t\tcd 12h &&\n \n@@ -5032,7 +5032,7 @@ test_expect_failure '12h: renaming a file within a renamed directory' '\n #                source/bar vs. source/subdir/bar\n \n test_setup_12i () {\n-\ttest_create_repo 12i &&\n+\tgit init 12i &&\n \t(\n \t\tcd 12i &&\n \n@@ -5090,7 +5090,7 @@ test_expect_success '12i: Directory rename causes rename-to-self' '\n #   Expected: {foo, bar, baz_2}, with conflicts on bar vs. subdir/bar\n \n test_setup_12j () {\n-\ttest_create_repo 12j &&\n+\tgit init 12j &&\n \t(\n \t\tcd 12j &&\n \n@@ -5148,7 +5148,7 @@ test_expect_success '12j: Directory rename to root causes rename-to-self' '\n #   Expected: dirA/{foo, bar, baz_2}, with conflicts on dirA/bar vs. dirB/bar\n \n test_setup_12k () {\n-\ttest_create_repo 12k &&\n+\tgit init 12k &&\n \t(\n \t\tcd 12k &&\n \n@@ -5218,7 +5218,7 @@ test_expect_success '12k: Directory rename with sibling causes rename-to-self' '\n #   is needed for there to be a sub1/ -> sub3/ rename.\n \n test_setup_12l () {\n-\ttest_create_repo 12l_$1 &&\n+\tgit init 12l_$1 &&\n \t(\n \t\tcd 12l_$1 &&\n \n@@ -5322,7 +5322,7 @@ test_expect_merge_algorithm failure success '12l (A into B): Rename into each ot\n #   Expected: y/{b,c,d,e/f}, with notices/conflicts for both y/d and y/e/f\n \n test_setup_13a () {\n-\ttest_create_repo 13a_$1 &&\n+\tgit init 13a_$1 &&\n \t(\n \t\tcd 13a_$1 &&\n \n@@ -5409,7 +5409,7 @@ test_expect_success '13a(info): messages for newly added files' '\n #             one about content, and one about file location\n \n test_setup_13b () {\n-\ttest_create_repo 13b_$1 &&\n+\tgit init 13b_$1 &&\n \t(\n \t\tcd 13b_$1 &&\n \n@@ -5496,7 +5496,7 @@ test_expect_success '13b(info): messages for transitive rename with conflicted c\n #             shown in testcase 13d.\n \n test_setup_13c () {\n-\ttest_create_repo 13c_$1 &&\n+\tgit init 13c_$1 &&\n \t(\n \t\tcd 13c_$1 &&\n \n@@ -5584,7 +5584,7 @@ test_expect_success '13c(info): messages for rename/rename(1to1) via transitive\n #               No conflict in where a/y ends up, so put it in d/y.\n \n test_setup_13d () {\n-\ttest_create_repo 13d_$1 &&\n+\tgit init 13d_$1 &&\n \t(\n \t\tcd 13d_$1 &&\n \n@@ -5710,7 +5710,7 @@ test_expect_success '13d(info): messages for rename/rename(1to1) via dual transi\n #          least avoids hitting a BUG().\n #\n test_setup_13e () {\n-\ttest_create_repo 13e &&\n+\tgit init 13e &&\n \t(\n \t\tcd 13e &&\n \ndiff --git a/t/t6426-merge-skip-unneeded-updates.sh b/t/t6426-merge-skip-unneeded-updates.sh\nindex 7b5f1c1dcd1..2bb8e7f09bb 100755\n--- a/t/t6426-merge-skip-unneeded-updates.sh\n+++ b/t/t6426-merge-skip-unneeded-updates.sh\n@@ -38,7 +38,7 @@ test_description=\"merge cases\"\n #   Expected: b_2\n \n test_setup_1a () {\n-\ttest_create_repo 1a_$1 &&\n+\tgit init 1a_$1 &&\n \t(\n \t\tcd 1a_$1 &&\n \n@@ -136,7 +136,7 @@ test_expect_success '1a-R: Modify(A)/Modify(B), change on B subset of A' '\n #   Expected: c_2\n \n test_setup_2a () {\n-\ttest_create_repo 2a_$1 &&\n+\tgit init 2a_$1 &&\n \t(\n \t\tcd 2a_$1 &&\n \n@@ -229,7 +229,7 @@ test_expect_success '2a-R: Modify/rename, merge into rename side' '\n #   Expected: c_2\n \n test_setup_2b () {\n-\ttest_create_repo 2b_$1 &&\n+\tgit init 2b_$1 &&\n \t(\n \t\tcd 2b_$1 &&\n \n@@ -336,7 +336,7 @@ test_expect_success '2b-R: Rename+Mod(A)/Mod(B), B mods subset of A' '\n #         not make that particular mistake.\n \n test_setup_2c () {\n-\ttest_create_repo 2c &&\n+\tgit init 2c &&\n \t(\n \t\tcd 2c &&\n \n@@ -437,7 +437,7 @@ test_expect_success '2c: Modify b & add c VS rename b->c' '\n #   Expected: bar/{bq_2, whatever}\n \n test_setup_3a () {\n-\ttest_create_repo 3a_$1 &&\n+\tgit init 3a_$1 &&\n \t(\n \t\tcd 3a_$1 &&\n \n@@ -537,7 +537,7 @@ test_expect_success '3a-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' '\n #   Expected: bar/{bq_2, whatever}\n \n test_setup_3b () {\n-\ttest_create_repo 3b_$1 &&\n+\tgit init 3b_$1 &&\n \t(\n \t\tcd 3b_$1 &&\n \n@@ -642,7 +642,7 @@ test_expect_success '3b-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' '\n #   Expected: b_2 for merge, b_4 in working copy\n \n test_setup_4a () {\n-\ttest_create_repo 4a &&\n+\tgit init 4a &&\n \t(\n \t\tcd 4a &&\n \n@@ -714,7 +714,7 @@ test_expect_merge_algorithm failure success '4a: Change on A, change on B subset\n #   Expected: c_2\n \n test_setup_4b () {\n-\ttest_create_repo 4b &&\n+\tgit init 4b &&\n \t(\n \t\tcd 4b &&\n \ndiff --git a/t/t6427-diff3-conflict-markers.sh b/t/t6427-diff3-conflict-markers.sh\nindex a9ee4cb207a..dd5fe6a4021 100755\n--- a/t/t6427-diff3-conflict-markers.sh\n+++ b/t/t6427-diff3-conflict-markers.sh\n@@ -19,7 +19,7 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n #\n \n test_expect_success 'setup no merge base' '\n-\ttest_create_repo no_merge_base &&\n+\tgit init no_merge_base &&\n \t(\n \t\tcd no_merge_base &&\n \n@@ -55,7 +55,7 @@ test_expect_success 'check no merge base' '\n #\n \n test_expect_success 'setup unique merge base' '\n-\ttest_create_repo unique_merge_base &&\n+\tgit init unique_merge_base &&\n \t(\n \t\tcd unique_merge_base &&\n \n@@ -116,7 +116,7 @@ test_expect_success 'check unique merge base' '\n #\n \n test_expect_success 'setup multiple merge bases' '\n-\ttest_create_repo multiple_merge_bases &&\n+\tgit init multiple_merge_bases &&\n \t(\n \t\tcd multiple_merge_bases &&\n \n@@ -190,7 +190,7 @@ test_expect_success 'check multiple merge bases' '\n '\n \n test_expect_success 'rebase --merge describes parent of commit being picked' '\n-\ttest_create_repo rebase &&\n+\tgit init rebase &&\n \t(\n \t\tcd rebase &&\n \t\ttest_commit base file &&\n@@ -212,7 +212,7 @@ test_expect_success 'rebase --apply describes fake ancestor base' '\n '\n \n test_setup_zdiff3 () {\n-\ttest_create_repo zdiff3 &&\n+\tgit init zdiff3 &&\n \t(\n \t\tcd zdiff3 &&\n \ndiff --git a/t/t6428-merge-conflicts-sparse.sh b/t/t6428-merge-conflicts-sparse.sh\nindex 064be1b629e..9919c3fa7cd 100755\n--- a/t/t6428-merge-conflicts-sparse.sh\n+++ b/t/t6428-merge-conflicts-sparse.sh\n@@ -29,7 +29,7 @@ test_description=\"merge cases\"\n # Testcase basic, conflicting changes in 'numerals'\n \n test_setup_numerals () {\n-\ttest_create_repo numerals_$1 &&\n+\tgit init numerals_$1 &&\n \t(\n \t\tcd numerals_$1 &&\n \ndiff --git a/t/t6429-merge-sequence-rename-caching.sh b/t/t6429-merge-sequence-rename-caching.sh\nindex e1ce9199164..7a630d970c6 100755\n--- a/t/t6429-merge-sequence-rename-caching.sh\n+++ b/t/t6429-merge-sequence-rename-caching.sh\n@@ -35,7 +35,7 @@ test_description=\"remember regular & dir renames in sequence of merges\"\n # preventing us from finding new renames.\n #\n test_expect_success 'caching renames does not preclude finding new ones' '\n-\ttest_create_repo caching-renames-and-new-renames &&\n+\tgit init caching-renames-and-new-renames &&\n \t(\n \t\tcd caching-renames-and-new-renames &&\n \n@@ -106,7 +106,7 @@ test_expect_success 'caching renames does not preclude finding new ones' '\n # should be able to only run rename detection on the upstream side one\n # time.)\n test_expect_success 'cherry-pick both a commit and its immediate revert' '\n-\ttest_create_repo pick-commit-and-its-immediate-revert &&\n+\tgit init pick-commit-and-its-immediate-revert &&\n \t(\n \t\tcd pick-commit-and-its-immediate-revert &&\n \n@@ -162,7 +162,7 @@ test_expect_success 'cherry-pick both a commit and its immediate revert' '\n # could cause a spurious rename/add conflict.\n #\n test_expect_success 'rename same file identically, then reintroduce it' '\n-\ttest_create_repo rename-rename-1to1-then-add-old-filename &&\n+\tgit init rename-rename-1to1-then-add-old-filename &&\n \t(\n \t\tcd rename-rename-1to1-then-add-old-filename &&\n \n@@ -229,7 +229,7 @@ test_expect_success 'rename same file identically, then reintroduce it' '\n # cached, the directory rename could put newfile in the wrong directory.\n #\n test_expect_success 'rename same file identically, then add file to old dir' '\n-\ttest_create_repo rename-rename-1to1-then-add-file-to-old-dir &&\n+\tgit init rename-rename-1to1-then-add-file-to-old-dir &&\n \t(\n \t\tcd rename-rename-1to1-then-add-file-to-old-dir &&\n \n@@ -311,7 +311,7 @@ test_expect_success 'rename same file identically, then add file to old dir' '\n # should avoid the need to re-detect upstream renames.)\n #\n test_expect_success 'cached dir rename does not prevent noticing later conflict' '\n-\ttest_create_repo dir-rename-cache-not-occluding-later-conflict &&\n+\tgit init dir-rename-cache-not-occluding-later-conflict &&\n \t(\n \t\tcd dir-rename-cache-not-occluding-later-conflict &&\n \n@@ -365,7 +365,7 @@ test_expect_success 'cached dir rename does not prevent noticing later conflict'\n \n # Helper for the next two tests\n test_setup_upstream_rename () {\n-\ttest_create_repo $1 &&\n+\tgit init $1 &&\n \t(\n \t\tcd $1 &&\n \n@@ -537,7 +537,7 @@ test_expect_success 'dir rename unneeded, then rename existing file into old dir\n \n # Helper for the next two tests\n test_setup_topic_rename () {\n-\ttest_create_repo $1 &&\n+\tgit init $1 &&\n \t(\n \t\tcd $1 &&\n \ndiff --git a/t/t6437-submodule-merge.sh b/t/t6437-submodule-merge.sh\nindex c253bf759ab..744c7b8bf87 100755\n--- a/t/t6437-submodule-merge.sh\n+++ b/t/t6437-submodule-merge.sh\n@@ -310,7 +310,7 @@ test_expect_success 'recursive merge with submodule' '\n #   Expected: path/ is submodule and file contents for B's path are somewhere\n \n test_expect_success 'setup file/submodule conflict' '\n-\ttest_create_repo file-submodule &&\n+\tgit init file-submodule &&\n \t(\n \t\tcd file-submodule &&\n \n@@ -325,7 +325,7 @@ test_expect_success 'setup file/submodule conflict' '\n \t\tgit commit -m B &&\n \n \t\tgit checkout A &&\n-\t\ttest_create_repo path &&\n+\t\tgit init path &&\n \t\ttest_commit -C path world &&\n \t\tgit submodule add ./path &&\n \t\tgit commit -m A\n@@ -385,7 +385,7 @@ test_expect_success 'file/submodule conflict; merge --abort works afterward' '\n #     under the submodule to be treated as untracked or in the way.\n \n test_expect_success 'setup directory/submodule conflict' '\n-\ttest_create_repo directory-submodule &&\n+\tgit init directory-submodule &&\n \t(\n \t\tcd directory-submodule &&\n \n@@ -408,7 +408,7 @@ test_expect_success 'setup directory/submodule conflict' '\n \t\tgit commit -m B2 &&\n \n \t\tgit checkout A &&\n-\t\ttest_create_repo path &&\n+\t\tgit init path &&\n \t\ttest_commit -C path hello world &&\n \t\tgit submodule add ./path &&\n \t\tgit commit -m A\n\nbase-commit: 6a475b71f8c4ce708d69fdc9317aefbde3769e25\n-- \ngitgitgadget\n"}]}