kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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 <johncai86@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
John Cai 2023-05-20 16:13:53 +00:00 committed by Junio C Hamano
parent a6171e1478
commit bd48dfad69
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
t/t7600-merge.sh
View File

@ -639,41 +639,41 @@ test_expect_success 'merge log message' '
test_debug 'git log --graph --decorate --oneline --all' test_debug 'git log --graph --decorate --oneline --all'


test_expect_success 'merge c1 with c0, c2, c0, and c1' ' test_expect_success 'merge c1 with c0, c2, c0, and c1' '
git reset --hard c1 && git reset --hard c1 &&
test_tick && test_tick &&
git merge c0 c2 c0 c1 && git merge c0 c2 c0 c1 &&
verify_merge file result.1-5 && verify_merge file result.1-5 &&
verify_parents $c1 $c2 verify_parents $c1 $c2
' '


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


test_expect_success 'merge c1 with c0, c2, c0, and c1' ' test_expect_success 'merge c1 with c0, c2, c0, and c1' '
git reset --hard c1 && git reset --hard c1 &&
test_tick && test_tick &&
git merge c0 c2 c0 c1 && git merge c0 c2 c0 c1 &&
verify_merge file result.1-5 && verify_merge file result.1-5 &&
verify_parents $c1 $c2 verify_parents $c1 $c2
' '


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


test_expect_success 'merge c1 with c1 and c2' ' test_expect_success 'merge c1 with c1 and c2' '
git reset --hard c1 && git reset --hard c1 &&
test_tick && test_tick &&
git merge c1 c2 && git merge c1 c2 &&
verify_merge file result.1-5 && verify_merge file result.1-5 &&
verify_parents $c1 $c2 verify_parents $c1 $c2
' '


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


test_expect_success 'merge fast-forward in a dirty tree' ' test_expect_success 'merge fast-forward in a dirty tree' '
git reset --hard c0 && git reset --hard c0 &&
mv file file1 && mv file file1 &&
cat file1 >file && cat file1 >file &&
rm -f file1 && rm -f file1 &&
git merge c2 git merge c2
' '


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