aboutsummaryrefslogtreecommitdiffstats
path: root/t/t6400-merge-df.sh
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2022-08-26 03:49:19 +0000
committerJunio C Hamano <gitster@pobox.com>2022-08-26 09:23:03 -0700
commit6693fb3f01cd99a1b786807a29e92bff43ffa2a0 (patch)
treedae8428460151399db67e4598aaa7d0693e0247a /t/t6400-merge-df.sh
parent7c46ea0ded70c921aedf22ced1afeea2a2a9ed26 (diff)
downloadgit-6693fb3f01cd99a1b786807a29e92bff43ffa2a0.tar.gz
t64xx: convert 'test_create_repo' to 'git init'
Convert the merge-specific tests (those in the t64xx range) over to using 'git init' instead of 'test_create_repo'. Reviewed-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6400-merge-df.sh')
-rwxr-xr-xt/t6400-merge-df.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6400-merge-df.sh b/t/t6400-merge-df.sh
index 57a67cf362..3de4ef6bd9 100755
--- a/t/t6400-merge-df.sh
+++ b/t/t6400-merge-df.sh
@@ -126,7 +126,7 @@ test_expect_success 'Simple merge in repo with interesting pathnames' '
# foo/bar-2/baz
# The fact that foo/bar-2 appears between foo/bar and foo/bar/baz
# can trip up some codepaths, and is the point of this test.
- test_create_repo name-ordering &&
+ git init name-ordering &&
(
cd name-ordering &&