mirror of
https://github.com/git/git.git
synced 2024-10-31 06:17:56 +01:00
b5967f820c
The test4012.png test vector file that was originally used for t4012 to check operations on binary files was later reused in other tests, making it no longer consistent to name it after a specific test. Rename it to more generic "test-binary-1.png". While at it, rename test9200b to "test-binary-2.png" (even though it is only used by t9200). Signed-off-by: Vitaliy Ivanov <vitalivanov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
263 lines
6.5 KiB
Bash
Executable file
263 lines
6.5 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='RCS merge replacement: merge-file'
|
|
. ./test-lib.sh
|
|
|
|
cat > orig.txt << EOF
|
|
Dominus regit me,
|
|
et nihil mihi deerit.
|
|
In loco pascuae ibi me collocavit,
|
|
super aquam refectionis educavit me;
|
|
animam meam convertit,
|
|
deduxit me super semitas jusitiae,
|
|
propter nomen suum.
|
|
EOF
|
|
|
|
cat > new1.txt << EOF
|
|
Dominus regit me,
|
|
et nihil mihi deerit.
|
|
In loco pascuae ibi me collocavit,
|
|
super aquam refectionis educavit me;
|
|
animam meam convertit,
|
|
deduxit me super semitas jusitiae,
|
|
propter nomen suum.
|
|
Nam et si ambulavero in medio umbrae mortis,
|
|
non timebo mala, quoniam tu mecum es:
|
|
virga tua et baculus tuus ipsa me consolata sunt.
|
|
EOF
|
|
|
|
cat > new2.txt << EOF
|
|
Dominus regit me, et nihil mihi deerit.
|
|
In loco pascuae ibi me collocavit,
|
|
super aquam refectionis educavit me;
|
|
animam meam convertit,
|
|
deduxit me super semitas jusitiae,
|
|
propter nomen suum.
|
|
EOF
|
|
|
|
cat > new3.txt << EOF
|
|
DOMINUS regit me,
|
|
et nihil mihi deerit.
|
|
In loco pascuae ibi me collocavit,
|
|
super aquam refectionis educavit me;
|
|
animam meam convertit,
|
|
deduxit me super semitas jusitiae,
|
|
propter nomen suum.
|
|
EOF
|
|
|
|
cat > new4.txt << EOF
|
|
Dominus regit me, et nihil mihi deerit.
|
|
In loco pascuae ibi me collocavit,
|
|
super aquam refectionis educavit me;
|
|
animam meam convertit,
|
|
deduxit me super semitas jusitiae,
|
|
EOF
|
|
printf "propter nomen suum." >> new4.txt
|
|
|
|
test_expect_success 'merge with no changes' '
|
|
cp orig.txt test.txt &&
|
|
git merge-file test.txt orig.txt orig.txt &&
|
|
test_cmp test.txt orig.txt
|
|
'
|
|
|
|
cp new1.txt test.txt
|
|
test_expect_success "merge without conflict" \
|
|
"git merge-file test.txt orig.txt new2.txt"
|
|
|
|
test_expect_success 'works in subdirectory' '
|
|
mkdir dir &&
|
|
cp new1.txt dir/a.txt &&
|
|
cp orig.txt dir/o.txt &&
|
|
cp new2.txt dir/b.txt &&
|
|
( cd dir && git merge-file a.txt o.txt b.txt )
|
|
'
|
|
|
|
cp new1.txt test.txt
|
|
test_expect_success "merge without conflict (--quiet)" \
|
|
"git merge-file --quiet test.txt orig.txt new2.txt"
|
|
|
|
cp new1.txt test2.txt
|
|
test_expect_success "merge without conflict (missing LF at EOF)" \
|
|
"git merge-file test2.txt orig.txt new2.txt"
|
|
|
|
test_expect_success "merge result added missing LF" \
|
|
"test_cmp test.txt test2.txt"
|
|
|
|
cp test.txt backup.txt
|
|
test_expect_success "merge with conflicts" \
|
|
"test_must_fail git merge-file test.txt orig.txt new3.txt"
|
|
|
|
cat > expect.txt << EOF
|
|
<<<<<<< test.txt
|
|
Dominus regit me, et nihil mihi deerit.
|
|
=======
|
|
DOMINUS regit me,
|
|
et nihil mihi deerit.
|
|
>>>>>>> new3.txt
|
|
In loco pascuae ibi me collocavit,
|
|
super aquam refectionis educavit me;
|
|
animam meam convertit,
|
|
deduxit me super semitas jusitiae,
|
|
propter nomen suum.
|
|
Nam et si ambulavero in medio umbrae mortis,
|
|
non timebo mala, quoniam tu mecum es:
|
|
virga tua et baculus tuus ipsa me consolata sunt.
|
|
EOF
|
|
|
|
test_expect_success "expected conflict markers" "test_cmp test.txt expect.txt"
|
|
|
|
cp backup.txt test.txt
|
|
test_expect_success "merge with conflicts, using -L" \
|
|
"test_must_fail git merge-file -L 1 -L 2 test.txt orig.txt new3.txt"
|
|
|
|
cat > expect.txt << EOF
|
|
<<<<<<< 1
|
|
Dominus regit me, et nihil mihi deerit.
|
|
=======
|
|
DOMINUS regit me,
|
|
et nihil mihi deerit.
|
|
>>>>>>> new3.txt
|
|
In loco pascuae ibi me collocavit,
|
|
super aquam refectionis educavit me;
|
|
animam meam convertit,
|
|
deduxit me super semitas jusitiae,
|
|
propter nomen suum.
|
|
Nam et si ambulavero in medio umbrae mortis,
|
|
non timebo mala, quoniam tu mecum es:
|
|
virga tua et baculus tuus ipsa me consolata sunt.
|
|
EOF
|
|
|
|
test_expect_success "expected conflict markers, with -L" \
|
|
"test_cmp test.txt expect.txt"
|
|
|
|
sed "s/ tu / TU /" < new1.txt > new5.txt
|
|
test_expect_success "conflict in removed tail" \
|
|
"test_must_fail git merge-file -p orig.txt new1.txt new5.txt > out"
|
|
|
|
cat > expect << EOF
|
|
Dominus regit me,
|
|
et nihil mihi deerit.
|
|
In loco pascuae ibi me collocavit,
|
|
super aquam refectionis educavit me;
|
|
animam meam convertit,
|
|
deduxit me super semitas jusitiae,
|
|
propter nomen suum.
|
|
<<<<<<< orig.txt
|
|
=======
|
|
Nam et si ambulavero in medio umbrae mortis,
|
|
non timebo mala, quoniam TU mecum es:
|
|
virga tua et baculus tuus ipsa me consolata sunt.
|
|
>>>>>>> new5.txt
|
|
EOF
|
|
|
|
test_expect_success "expected conflict markers" "test_cmp expect out"
|
|
|
|
test_expect_success 'binary files cannot be merged' '
|
|
test_must_fail git merge-file -p \
|
|
orig.txt "$TEST_DIRECTORY"/test-binary-1.png new1.txt 2> merge.err &&
|
|
grep "Cannot merge binary files" merge.err
|
|
'
|
|
|
|
sed -e "s/deerit.\$/deerit;/" -e "s/me;\$/me./" < new5.txt > new6.txt
|
|
sed -e "s/deerit.\$/deerit,/" -e "s/me;\$/me,/" < new5.txt > new7.txt
|
|
|
|
test_expect_success 'MERGE_ZEALOUS simplifies non-conflicts' '
|
|
|
|
test_must_fail git merge-file -p new6.txt new5.txt new7.txt > output &&
|
|
test 1 = $(grep ======= < output | wc -l)
|
|
|
|
'
|
|
|
|
sed -e 's/deerit./&%%%%/' -e "s/locavit,/locavit;/"< new6.txt | tr '%' '\012' > new8.txt
|
|
sed -e 's/deerit./&%%%%/' -e "s/locavit,/locavit --/" < new7.txt | tr '%' '\012' > new9.txt
|
|
|
|
test_expect_success 'ZEALOUS_ALNUM' '
|
|
|
|
test_must_fail git merge-file -p \
|
|
new8.txt new5.txt new9.txt > merge.out &&
|
|
test 1 = $(grep ======= < merge.out | wc -l)
|
|
|
|
'
|
|
|
|
cat >expect <<\EOF
|
|
Dominus regit me,
|
|
<<<<<<< new8.txt
|
|
et nihil mihi deerit;
|
|
|
|
|
|
|
|
|
|
In loco pascuae ibi me collocavit;
|
|
super aquam refectionis educavit me.
|
|
||||||| new5.txt
|
|
et nihil mihi deerit.
|
|
In loco pascuae ibi me collocavit,
|
|
super aquam refectionis educavit me;
|
|
=======
|
|
et nihil mihi deerit,
|
|
|
|
|
|
|
|
|
|
In loco pascuae ibi me collocavit --
|
|
super aquam refectionis educavit me,
|
|
>>>>>>> new9.txt
|
|
animam meam convertit,
|
|
deduxit me super semitas jusitiae,
|
|
propter nomen suum.
|
|
Nam et si ambulavero in medio umbrae mortis,
|
|
non timebo mala, quoniam TU mecum es:
|
|
virga tua et baculus tuus ipsa me consolata sunt.
|
|
EOF
|
|
|
|
test_expect_success '"diff3 -m" style output (1)' '
|
|
test_must_fail git merge-file -p --diff3 \
|
|
new8.txt new5.txt new9.txt >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success '"diff3 -m" style output (2)' '
|
|
git config merge.conflictstyle diff3 &&
|
|
test_must_fail git merge-file -p \
|
|
new8.txt new5.txt new9.txt >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
cat >expect <<\EOF
|
|
Dominus regit me,
|
|
<<<<<<<<<< new8.txt
|
|
et nihil mihi deerit;
|
|
|
|
|
|
|
|
|
|
In loco pascuae ibi me collocavit;
|
|
super aquam refectionis educavit me.
|
|
|||||||||| new5.txt
|
|
et nihil mihi deerit.
|
|
In loco pascuae ibi me collocavit,
|
|
super aquam refectionis educavit me;
|
|
==========
|
|
et nihil mihi deerit,
|
|
|
|
|
|
|
|
|
|
In loco pascuae ibi me collocavit --
|
|
super aquam refectionis educavit me,
|
|
>>>>>>>>>> new9.txt
|
|
animam meam convertit,
|
|
deduxit me super semitas jusitiae,
|
|
propter nomen suum.
|
|
Nam et si ambulavero in medio umbrae mortis,
|
|
non timebo mala, quoniam TU mecum es:
|
|
virga tua et baculus tuus ipsa me consolata sunt.
|
|
EOF
|
|
|
|
test_expect_success 'marker size' '
|
|
test_must_fail git merge-file -p --marker-size=10 \
|
|
new8.txt new5.txt new9.txt >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_done
|