Skip to content

Commit bd48dfa

Browse files
john-caigitster
authored andcommitted
t7600-merge: 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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent a6171e1 commit bd48dfa

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

t/t7600-merge.sh

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -639,41 +639,41 @@ test_expect_success 'merge log message' '
639639
test_debug 'git log --graph --decorate --oneline --all'
640640

641641
test_expect_success 'merge c1 with c0, c2, c0, and c1' '
642-
git reset --hard c1 &&
643-
test_tick &&
644-
git merge c0 c2 c0 c1 &&
645-
verify_merge file result.1-5 &&
646-
verify_parents $c1 $c2
642+
git reset --hard c1 &&
643+
test_tick &&
644+
git merge c0 c2 c0 c1 &&
645+
verify_merge file result.1-5 &&
646+
verify_parents $c1 $c2
647647
'
648648

649649
test_debug 'git log --graph --decorate --oneline --all'
650650

651651
test_expect_success 'merge c1 with c0, c2, c0, and c1' '
652-
git reset --hard c1 &&
653-
test_tick &&
654-
git merge c0 c2 c0 c1 &&
655-
verify_merge file result.1-5 &&
656-
verify_parents $c1 $c2
652+
git reset --hard c1 &&
653+
test_tick &&
654+
git merge c0 c2 c0 c1 &&
655+
verify_merge file result.1-5 &&
656+
verify_parents $c1 $c2
657657
'
658658

659659
test_debug 'git log --graph --decorate --oneline --all'
660660

661661
test_expect_success 'merge c1 with c1 and c2' '
662-
git reset --hard c1 &&
663-
test_tick &&
664-
git merge c1 c2 &&
665-
verify_merge file result.1-5 &&
666-
verify_parents $c1 $c2
662+
git reset --hard c1 &&
663+
test_tick &&
664+
git merge c1 c2 &&
665+
verify_merge file result.1-5 &&
666+
verify_parents $c1 $c2
667667
'
668668

669669
test_debug 'git log --graph --decorate --oneline --all'
670670

671671
test_expect_success 'merge fast-forward in a dirty tree' '
672-
git reset --hard c0 &&
673-
mv file file1 &&
674-
cat file1 >file &&
675-
rm -f file1 &&
676-
git merge c2
672+
git reset --hard c0 &&
673+
mv file file1 &&
674+
cat file1 >file &&
675+
rm -f file1 &&
676+
git merge c2
677677
'
678678

679679
test_debug 'git log --graph --decorate --oneline --all'

0 commit comments

Comments
 (0)