diff options
| author | Elijah Newren <newren@gmail.com> | 2022-08-26 05:49:19 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-26 18:23:03 +0200 |
| commit | 6693fb3f01cd99a1b786807a29e92bff43ffa2a0 (patch) | |
| tree | dae8428460151399db67e4598aaa7d0693e0247a /t/t6428-merge-conflicts-sparse.sh | |
| parent | The fifteenth batch (diff) | |
| download | git-6693fb3f01cd99a1b786807a29e92bff43ffa2a0.tar.xz git-6693fb3f01cd99a1b786807a29e92bff43ffa2a0.zip | |
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/t6428-merge-conflicts-sparse.sh')
| -rwxr-xr-x | t/t6428-merge-conflicts-sparse.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6428-merge-conflicts-sparse.sh b/t/t6428-merge-conflicts-sparse.sh index 064be1b629..9919c3fa7c 100755 --- a/t/t6428-merge-conflicts-sparse.sh +++ b/t/t6428-merge-conflicts-sparse.sh @@ -29,7 +29,7 @@ test_description="merge cases" # Testcase basic, conflicting changes in 'numerals' test_setup_numerals () { - test_create_repo numerals_$1 && + git init numerals_$1 && ( cd numerals_$1 && |