2006-12-06 16:26:06 +01:00
|
|
|
#!/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
|
2007-01-16 02:31:29 +01:00
|
|
|
printf "propter nomen suum." >> new4.txt
|
2006-12-06 16:26:06 +01:00
|
|
|
|
2009-05-25 02:21:14 +02:00
|
|
|
test_expect_success 'merge with no changes' '
|
2009-05-25 02:21:13 +02:00
|
|
|
cp orig.txt test.txt &&
|
|
|
|
|
git merge-file test.txt orig.txt orig.txt &&
|
|
|
|
|
test_cmp test.txt orig.txt
|
|
|
|
|
'
|
|
|
|
|
|
2006-12-06 16:26:06 +01:00
|
|
|
cp new1.txt test.txt
|
|
|
|
|
test_expect_success "merge without conflict" \
|
2007-07-03 07:52:14 +02:00
|
|
|
"git merge-file test.txt orig.txt new2.txt"
|
2006-12-06 16:26:06 +01:00
|
|
|
|
2010-10-17 21:23:22 +02:00
|
|
|
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 &&
|
2015-02-08 17:53:53 +01:00
|
|
|
( cd dir && git merge-file a.txt o.txt b.txt ) &&
|
|
|
|
|
test_path_is_missing a.txt
|
2010-10-17 21:23:22 +02:00
|
|
|
'
|
|
|
|
|
|
2010-02-25 21:03:44 +01:00
|
|
|
cp new1.txt test.txt
|
|
|
|
|
test_expect_success "merge without conflict (--quiet)" \
|
|
|
|
|
"git merge-file --quiet test.txt orig.txt new2.txt"
|
|
|
|
|
|
2006-12-06 16:26:06 +01:00
|
|
|
cp new1.txt test2.txt
|
2014-06-29 00:04:45 +02:00
|
|
|
test_expect_failure "merge without conflict (missing LF at EOF)" \
|
|
|
|
|
"git merge-file test2.txt orig.txt new4.txt"
|
2006-12-06 16:26:06 +01:00
|
|
|
|
2014-06-29 00:04:45 +02:00
|
|
|
test_expect_failure "merge result added missing LF" \
|
2008-05-24 07:28:56 +02:00
|
|
|
"test_cmp test.txt test2.txt"
|
2006-12-06 16:26:06 +01:00
|
|
|
|
2014-06-29 00:04:46 +02:00
|
|
|
cp new4.txt test3.txt
|
|
|
|
|
test_expect_success "merge without conflict (missing LF at EOF, away from change in the other file)" \
|
|
|
|
|
"git merge-file --quiet test3.txt new2.txt new3.txt"
|
|
|
|
|
|
|
|
|
|
cat > expect.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." >> expect.txt
|
|
|
|
|
|
|
|
|
|
test_expect_success "merge does not add LF away of change" \
|
|
|
|
|
"test_cmp test3.txt expect.txt"
|
|
|
|
|
|
2006-12-06 16:26:06 +01:00
|
|
|
cp test.txt backup.txt
|
2008-02-01 10:50:53 +01:00
|
|
|
test_expect_success "merge with conflicts" \
|
2008-07-12 17:47:52 +02:00
|
|
|
"test_must_fail git merge-file test.txt orig.txt new3.txt"
|
2006-12-06 16:26:06 +01:00
|
|
|
|
|
|
|
|
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
|
|
|
|
|
|
2008-05-24 07:28:56 +02:00
|
|
|
test_expect_success "expected conflict markers" "test_cmp test.txt expect.txt"
|
2006-12-06 16:26:06 +01:00
|
|
|
|
|
|
|
|
cp backup.txt test.txt
|
2014-06-29 00:04:46 +02:00
|
|
|
|
|
|
|
|
cat > expect.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
|
|
|
|
|
test_expect_success "merge conflicting with --ours" \
|
|
|
|
|
"git merge-file --ours test.txt orig.txt new3.txt && test_cmp test.txt expect.txt"
|
|
|
|
|
cp backup.txt test.txt
|
|
|
|
|
|
|
|
|
|
cat > expect.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
|
|
|
|
|
test_expect_success "merge conflicting with --theirs" \
|
|
|
|
|
"git merge-file --theirs test.txt orig.txt new3.txt && test_cmp test.txt expect.txt"
|
|
|
|
|
cp backup.txt test.txt
|
|
|
|
|
|
|
|
|
|
cat > expect.txt << EOF
|
|
|
|
|
Dominus regit me, et nihil mihi deerit.
|
|
|
|
|
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
|
|
|
|
|
test_expect_success "merge conflicting with --union" \
|
|
|
|
|
"git merge-file --union test.txt orig.txt new3.txt && test_cmp test.txt expect.txt"
|
|
|
|
|
cp backup.txt test.txt
|
|
|
|
|
|
2008-02-01 10:50:53 +01:00
|
|
|
test_expect_success "merge with conflicts, using -L" \
|
2008-07-12 17:47:52 +02:00
|
|
|
"test_must_fail git merge-file -L 1 -L 2 test.txt orig.txt new3.txt"
|
2006-12-06 16:26:06 +01:00
|
|
|
|
|
|
|
|
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" \
|
2008-05-24 07:28:56 +02:00
|
|
|
"test_cmp test.txt expect.txt"
|
2006-12-06 16:26:06 +01:00
|
|
|
|
2006-12-28 17:13:33 +01:00
|
|
|
sed "s/ tu / TU /" < new1.txt > new5.txt
|
2008-02-01 10:50:53 +01:00
|
|
|
test_expect_success "conflict in removed tail" \
|
2008-07-12 17:47:52 +02:00
|
|
|
"test_must_fail git merge-file -p orig.txt new1.txt new5.txt > out"
|
2006-12-28 17:13:33 +01:00
|
|
|
|
|
|
|
|
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
|
|
|
|
|
|
2008-05-24 07:28:56 +02:00
|
|
|
test_expect_success "expected conflict markers" "test_cmp expect out"
|
2006-12-28 17:13:33 +01:00
|
|
|
|
2007-06-05 04:37:13 +02:00
|
|
|
test_expect_success 'binary files cannot be merged' '
|
2008-07-12 17:47:52 +02:00
|
|
|
test_must_fail git merge-file -p \
|
2011-07-19 19:21:47 +02:00
|
|
|
orig.txt "$TEST_DIRECTORY"/test-binary-1.png new1.txt 2> merge.err &&
|
2007-06-05 04:37:13 +02:00
|
|
|
grep "Cannot merge binary files" merge.err
|
|
|
|
|
'
|
|
|
|
|
|
2010-01-27 00:08:31 +01:00
|
|
|
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
|
2008-02-17 20:07:19 +01:00
|
|
|
|
|
|
|
|
test_expect_success 'MERGE_ZEALOUS simplifies non-conflicts' '
|
|
|
|
|
|
2008-07-12 17:47:52 +02:00
|
|
|
test_must_fail git merge-file -p new6.txt new5.txt new7.txt > output &&
|
2008-02-17 20:07:19 +01:00
|
|
|
test 1 = $(grep ======= < output | wc -l)
|
|
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
2008-09-08 20:29:18 +02:00
|
|
|
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
|
2008-02-17 20:07:40 +01:00
|
|
|
|
|
|
|
|
test_expect_success 'ZEALOUS_ALNUM' '
|
|
|
|
|
|
2008-07-12 17:47:52 +02:00
|
|
|
test_must_fail git merge-file -p \
|
|
|
|
|
new8.txt new5.txt new9.txt > merge.out &&
|
2008-02-17 20:07:40 +01:00
|
|
|
test 1 = $(grep ======= < merge.out | wc -l)
|
|
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
2008-08-28 10:10:04 +02:00
|
|
|
cat >expect <<\EOF
|
|
|
|
|
Dominus regit me,
|
|
|
|
|
<<<<<<< new8.txt
|
|
|
|
|
et nihil mihi deerit;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
In loco pascuae ibi me collocavit;
|
|
|
|
|
super aquam refectionis educavit me.
|
2010-03-21 01:37:33 +01:00
|
|
|
||||||| new5.txt
|
2008-08-28 10:10:04 +02:00
|
|
|
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
|
|
|
|
|
|
2008-08-29 19:49:56 +02:00
|
|
|
test_expect_success '"diff3 -m" style output (1)' '
|
2008-08-28 10:10:04 +02:00
|
|
|
test_must_fail git merge-file -p --diff3 \
|
|
|
|
|
new8.txt new5.txt new9.txt >actual &&
|
|
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
2008-08-29 19:49:56 +02:00
|
|
|
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
|
|
|
|
|
'
|
|
|
|
|
|
2010-03-01 22:46:27 +01:00
|
|
|
cat >expect <<\EOF
|
|
|
|
|
Dominus regit me,
|
|
|
|
|
<<<<<<<<<< new8.txt
|
|
|
|
|
et nihil mihi deerit;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
In loco pascuae ibi me collocavit;
|
|
|
|
|
super aquam refectionis educavit me.
|
2010-03-21 01:37:33 +01:00
|
|
|
|||||||||| new5.txt
|
2010-03-01 22:46:27 +01:00
|
|
|
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
|
|
|
|
|
'
|
|
|
|
|
|
2014-06-29 00:04:46 +02:00
|
|
|
printf "line1\nline2\nline3" >nolf-orig.txt
|
|
|
|
|
printf "line1\nline2\nline3x" >nolf-diff1.txt
|
|
|
|
|
printf "line1\nline2\nline3y" >nolf-diff2.txt
|
|
|
|
|
|
|
|
|
|
test_expect_success 'conflict at EOF without LF resolved by --ours' \
|
|
|
|
|
'git merge-file -p --ours nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt &&
|
|
|
|
|
printf "line1\nline2\nline3x" >expect.txt &&
|
|
|
|
|
test_cmp expect.txt output.txt'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'conflict at EOF without LF resolved by --theirs' \
|
|
|
|
|
'git merge-file -p --theirs nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt &&
|
|
|
|
|
printf "line1\nline2\nline3y" >expect.txt &&
|
|
|
|
|
test_cmp expect.txt output.txt'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'conflict at EOF without LF resolved by --union' \
|
|
|
|
|
'git merge-file -p --union nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt &&
|
|
|
|
|
printf "line1\nline2\nline3x\nline3y" >expect.txt &&
|
|
|
|
|
test_cmp expect.txt output.txt'
|
|
|
|
|
|
2016-01-27 17:37:40 +01:00
|
|
|
test_expect_success 'conflict sections match existing line endings' '
|
merge-file: let conflict markers match end-of-line style of the context
When merging files with CR/LF line endings, the conflict markers should
match those, lest the output file has mixed line endings.
This is particularly of interest on Windows, where some editors get
*really* confused by mixed line endings.
The original version of this patch by Beat Bolli respected core.eol, and
a subsequent improvement by this developer also respected gitattributes.
This approach was suboptimal, though: `git merge-file` was invented as a
drop-in replacement for GNU merge and as such has no problem operating
outside of any repository at all!
Another problem with the original approach was pointed out by Junio
Hamano: legacy repositories might have their text files committed using
CR/LF line endings (and core.eol and the gitattributes would give us a
false impression there). Therefore, the much superior approach is to
simply match the context's line endings, if any.
We actually do not have to look at the *entire* context at all: if the
files are all LF-only, or if they all have CR/LF line endings, it is
sufficient to look at just a *single* line to match that style. And if
the line endings are mixed anyway, it is *still* okay to imitate just a
single line's eol: we will just add to the pile of mixed line endings,
and there is nothing we can do about that.
So what we do is: we look at the line preceding the conflict, falling
back to the line preceding that in case it was the last line and had no
line ending, falling back to the first line, first in the first
post-image, then the second post-image, and finally the pre-image.
If we find consistent CR/LF (or undecided) end-of-line style, we match
that, otherwise we use LF-only line endings for the conflict markers.
Note that while it is true that there have to be at least two lines we
can look at (otherwise there would be no conflict), the same is not true
for line *endings*: the three files in question could all consist of a
single line without any line ending, each. In this case we fall back to
using LF-only.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-01-27 17:37:36 +01:00
|
|
|
printf "1\\r\\n2\\r\\n3" >crlf-orig.txt &&
|
|
|
|
|
printf "1\\r\\n2\\r\\n4" >crlf-diff1.txt &&
|
|
|
|
|
printf "1\\r\\n2\\r\\n5" >crlf-diff2.txt &&
|
|
|
|
|
test_must_fail git -c core.eol=crlf merge-file -p \
|
|
|
|
|
crlf-diff1.txt crlf-orig.txt crlf-diff2.txt >crlf.txt &&
|
|
|
|
|
test $(tr "\015" Q <crlf.txt | grep "^[<=>].*Q$" | wc -l) = 3 &&
|
2016-01-27 17:37:40 +01:00
|
|
|
test $(tr "\015" Q <crlf.txt | grep "[345]Q$" | wc -l) = 3 &&
|
merge-file: let conflict markers match end-of-line style of the context
When merging files with CR/LF line endings, the conflict markers should
match those, lest the output file has mixed line endings.
This is particularly of interest on Windows, where some editors get
*really* confused by mixed line endings.
The original version of this patch by Beat Bolli respected core.eol, and
a subsequent improvement by this developer also respected gitattributes.
This approach was suboptimal, though: `git merge-file` was invented as a
drop-in replacement for GNU merge and as such has no problem operating
outside of any repository at all!
Another problem with the original approach was pointed out by Junio
Hamano: legacy repositories might have their text files committed using
CR/LF line endings (and core.eol and the gitattributes would give us a
false impression there). Therefore, the much superior approach is to
simply match the context's line endings, if any.
We actually do not have to look at the *entire* context at all: if the
files are all LF-only, or if they all have CR/LF line endings, it is
sufficient to look at just a *single* line to match that style. And if
the line endings are mixed anyway, it is *still* okay to imitate just a
single line's eol: we will just add to the pile of mixed line endings,
and there is nothing we can do about that.
So what we do is: we look at the line preceding the conflict, falling
back to the line preceding that in case it was the last line and had no
line ending, falling back to the first line, first in the first
post-image, then the second post-image, and finally the pre-image.
If we find consistent CR/LF (or undecided) end-of-line style, we match
that, otherwise we use LF-only line endings for the conflict markers.
Note that while it is true that there have to be at least two lines we
can look at (otherwise there would be no conflict), the same is not true
for line *endings*: the three files in question could all consist of a
single line without any line ending, each. In this case we fall back to
using LF-only.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-01-27 17:37:36 +01:00
|
|
|
test_must_fail git -c core.eol=crlf merge-file -p \
|
|
|
|
|
nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >nolf.txt &&
|
|
|
|
|
test $(tr "\015" Q <nolf.txt | grep "^[<=>].*Q$" | wc -l) = 0
|
|
|
|
|
'
|
|
|
|
|
|
2006-12-06 16:26:06 +01:00
|
|
|
test_done
|