global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-09 17:46:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

t64xx: convert 'test_create_repo' to 'git init'

Browse Source 
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>
This commit is contained in:
Elijah Newren
2022-08-26 03:49:19 +00:00
committed by Junio C Hamano
parent 7c46ea0ded
commit 6693fb3f01
11 changed files with 136 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
t/t6427-diff3-conflict-markers.sh
View File

@@ -19,7 +19,7 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
#
test_expect_success 'setup no merge base' '
test_create_repo no_merge_base &&
git init no_merge_base &&
(
cd no_merge_base &&
@@ -55,7 +55,7 @@ test_expect_success 'check no merge base' '
#
test_expect_success 'setup unique merge base' '
test_create_repo unique_merge_base &&
git init unique_merge_base &&
(
cd unique_merge_base &&
@@ -116,7 +116,7 @@ test_expect_success 'check unique merge base' '
#
test_expect_success 'setup multiple merge bases' '
test_create_repo multiple_merge_bases &&
git init multiple_merge_bases &&
(
cd multiple_merge_bases &&
@@ -190,7 +190,7 @@ test_expect_success 'check multiple merge bases' '
'
test_expect_success 'rebase --merge describes parent of commit being picked' '
test_create_repo rebase &&
git init rebase &&
(
cd rebase &&
test_commit base file &&
@@ -212,7 +212,7 @@ test_expect_success 'rebase --apply describes fake ancestor base' '
'
test_setup_zdiff3 () {
test_create_repo zdiff3 &&
git init zdiff3 &&
(
cd zdiff3 &&