Subject: Re: [PATCH] xmerge.c: fix xdl_merge to conform with the manual

From: Anton Trunov <[email-masked]>
Date: Wed, 04 Mar 2015 12:55:33 +0300

On 04/03/15 10:07, Eric Sunshine wrote:
> On Tue, Mar 3, 2015 at 3:17 PM, Torsten Bögershausen <[email-masked]> wrote:
>> On 2015-03-03 18.37, Anton Trunov wrote:
>> []
>>> Signed-off-by: Anton Trunov <anton.a.trunov <at> gmail.com>
>> Should we use the "real email" here (with the '@') ?
>>> ---
>>> diff --git a/t/t3032-merge-recursive-options.sh b/t/t3032-merge-recursive-options.sh
>>> index 4029c9c..4cbedb4 100755
>>> --- a/t/t3032-merge-recursive-options.sh
>>> +++ b/t/t3032-merge-recursive-options.sh
>>> @@ -204,4 +204,47 @@ test_expect_success '--ignore-space-at-eol' '
>>>       test_cmp expected actual
>>>  '
>>>
>>> +# Setup for automerging with whitespace-only changes
>>> +# on both sides and in *all* lines
>>> +
>>> +test_expect_success 'setup: w/s only changes in all lines on both sides' '
>>> +     git rm -rf . &&
>>> +     git clean -fdqx &&
>>> +     rm -rf .git &&
>>> +     git init
>> missing &&
>>> +
>>> +     echo " two words" >text.txt &&
>>> +     git add text.txt &&
>>> +     test_tick &&
>>> +     git commit -m "Initial revision" &&
>>> +
>>> +     git checkout -b remote &&
>>> +     echo " \t\ttwo     words  " >text.txt &&
> 
> Use of echo "\t" is not portable. Either embed literal tab characters
> or use printf "\t".
OK.
Shouldn't it be printf "\t\n" for exact substitute for echo "\t"?

>>> +     git commit -a -m "remote: insert whitespace only" &&
>>> +
>>> +     git checkout master &&
>>> +     echo "    two words" >text.txt &&
>>> +     git commit -a -m "master: insert whitespace only"
>>> +'
>>> +
>>> +test_expect_success 'w/s only in all lines: --ignore-space-change preserves ours' '