mirror of
https://github.com/git/git
synced 2024-10-01 06:05:20 +00:00
t7111-reset-table: modernize test format
Some tests still use the old format with four spaces indentation. Standardize the tests to the new format with tab indentation. Signed-off-by: John Cai <johncai86@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
a32a724b03
commit
c970681f50
|
@ -10,9 +10,9 @@ TEST_PASSES_SANITIZE_LEAK=true
|
||||||
|
|
||||||
|
|
||||||
test_expect_success 'creating initial commits' '
|
test_expect_success 'creating initial commits' '
|
||||||
test_commit E file1 &&
|
test_commit E file1 &&
|
||||||
test_commit D file1 &&
|
test_commit D file1 &&
|
||||||
test_commit C file1
|
test_commit C file1
|
||||||
'
|
'
|
||||||
|
|
||||||
while read W1 I1 H1 T opt W2 I2 H2
|
while read W1 I1 H1 T opt W2 I2 H2
|
||||||
|
@ -74,13 +74,13 @@ B C C C keep B C C
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
test_expect_success 'setting up branches to test with unmerged entries' '
|
test_expect_success 'setting up branches to test with unmerged entries' '
|
||||||
git reset --hard C &&
|
git reset --hard C &&
|
||||||
git branch branch1 &&
|
git branch branch1 &&
|
||||||
git branch branch2 &&
|
git branch branch2 &&
|
||||||
git checkout branch1 &&
|
git checkout branch1 &&
|
||||||
test_commit B1 file1 &&
|
test_commit B1 file1 &&
|
||||||
git checkout branch2 &&
|
git checkout branch2 &&
|
||||||
test_commit B file1
|
test_commit B file1
|
||||||
'
|
'
|
||||||
|
|
||||||
while read W1 I1 H1 T opt W2 I2 H2
|
while read W1 I1 H1 T opt W2 I2 H2
|
||||||
|
|
Loading…
Reference in a new issue