mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t64*: preemptively adjust alignment to prepare for master -> main

Browse Source 
We are in the process of renaming the default branch name to `main`,
which is two characters shorter than `master`. Therefore, some lines
need to be adjusted in t6416, t6422 and t6427 that want to align text
involving the default branch name.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin
2020-11-18 23:44:37 +00:00
committed by Junio C Hamano
parent 1550bb6ed0
commit 1f53df54eb
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
t/t6416-recursive-corner-cases.sh
View File

@ -388,7 +388,7 @@ test_expect_success 'git detects conflict merging criss-cross+modify/delete' '
test_line_count = 2 out &&
git rev-parse >expect \
master:file B:file &&
master:file B:file &&
git rev-parse >actual \
:1:file :2:file &&
test_cmp expect actual
@ -410,7 +410,7 @@ test_expect_success 'git detects conflict merging criss-cross+modify/delete, rev
test_line_count = 2 out &&
git rev-parse >expect \
master:file B:file &&
master:file B:file &&
git rev-parse >actual \
:1:file :3:file &&
test_cmp expect actual
@ -1556,7 +1556,7 @@ test_expect_failure 'check conflicting modes for regular file' '
# Setup:
# L1---L2
# / \ / \
# master X ?
# master X ?
# \ / \ /
# R1---R2
#
@ -1751,7 +1751,7 @@ test_expect_success 'check nested conflicts' '
# Setup:
# L1---L2---L3
# / \ / \ / \
# master X1 X2 ?
# master X1 X2 ?
# \ / \ / \ /
# R1---R2---R3
#

4
t/t6422-merge-rename-corner-cases.sh
View File

@ -1133,7 +1133,7 @@ test_conflicts_with_adds_and_renames() {
# Setup:
# L
# / \
# master ?
# master ?
# \ /
# R
#
@ -1293,7 +1293,7 @@ test_conflicts_with_adds_and_renames add add
# Setup:
# L
# / \
# master ?
# master ?
# \ /
# R
#

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

@ -46,7 +46,7 @@ test_expect_success 'check no merge base' '
# Setup:
# L1
# / \
# master ?
# master ?
# \ /
# R1
#
@ -104,7 +104,7 @@ test_expect_success 'check unique merge base' '
# Setup:
# L1---L2--L3
# / \ / \
# master X1 ?
# master X1 ?
# \ / \ /
# R1---R2--R3
#