From: Ramsay Jones <ramsay@ramsayjones•plus.com>
To: "Johannes Schindelin" <Johannes.Schindelin@gmx•de>,
"Torsten Bögershausen" <tboegi@web•de>
Cc: Junio C Hamano <gitster@pobox•com>,
git@vger•kernel.org, Beat Bolli <dev+git@drbeat•li>,
Jeff King <peff@peff•org>,
Eric Sunshine <sunshine@sunshineco•com>
Subject: Re: [PATCH v2 1/1] merge-file: let conflict markers match end-of-line style of the context
Date: Mon, 25 Jan 2016 19:45:51 +0000 [thread overview]
Message-ID: <56A67B6F.60300@ramsayjones.plus.com> (raw)
In-Reply-To: <alpine.DEB.2.20.1601250749580.2964@virtualbox>
On 25/01/16 06:53, Johannes Schindelin wrote:
> Hi Torsten,
>
> On Sun, 24 Jan 2016, Torsten Bögershausen wrote:
>
>> On 24.01.16 11:48, Johannes Schindelin wrote:
>> (I had the same reasoning about the CRLF in the working tree:
>> We don't need to look at core.autocrlf/attributes, so Ack from me)
>>
>>> +test_expect_success 'conflict markers match existing line endings' '
>>> + append_cr <nolf-orig.txt >crlf-orig.txt &&
>>> + append_cr <nolf-diff1.txt >crlf-diff1.txt &&
>>> + append_cr <nolf-diff2.txt >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 "\\.txtQ$" | wc -l) = 3 &&
>>> + 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 "\\.txtQ$" | wc -l) = 0
>>> +'
>>> +
>>
>> Minor remark:
>>
>> Ramsay suggested a test that doesn't use grep or wc and looks like this:
>>
>> test_expect_success 'conflict markers contain CRLF when core.eol=crlf' '
>> test_must_fail git -c core.eol=crlf merge-file -p \
>> nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt &&
>> tr "\015" Q <output.txt | sed -n "/^[<=>|].*Q$/p" >out.txt &&
>> cat >expect.txt <<-\EOF &&
>> <<<<<<< nolf-diff1.txtQ
>> ||||||| nolf-orig.txtQ
>> =======Q
>> >>>>>>> nolf-diff2.txtQ
>> EOF
>> test_cmp expect.txt out.txt
>> '
>
> Probably he wrapped it at less than 192 columns per row, though ;-)
>
;-)
> Seriously again, this longer version might test more, but it definitely
> also tests more than what I actually want to test: I am simply interested
> to verify that the conflict markers end in CR/LF when appropriate.
But you are only testing 3/4 conflict markers end in CR/LF. :-D
> Read: I
> am uncertain that I want to spend the additional lines on testing more
> than actually necessary.
If the here doc is too verbose for you, how about something like this
(totally untested):
test $(tr "\015" Q <crlf.txt | grep "^[<=>|].*Q$" | wc -l) -eq 4
instead?
HTH
ATB,
Ramsay Jones
next prev parent reply other threads:[~2016-01-25 19:46 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-22 17:01 [PATCH 0/2] Let merge-file write out conflict markers with correct EOLs Johannes Schindelin
2016-01-22 17:01 ` [PATCH 1/2] convert: add a helper to determine the correct EOL for a given path Johannes Schindelin
2016-01-22 18:47 ` Junio C Hamano
2016-01-22 19:04 ` Johannes Schindelin
2016-01-23 7:05 ` Torsten Bögershausen
2016-01-24 10:42 ` Johannes Schindelin
2016-01-23 6:12 ` Torsten Bögershausen
2016-01-24 10:41 ` Johannes Schindelin
2016-01-22 17:01 ` [PATCH 2/2] merge-file: consider core.crlf when writing merge markers Johannes Schindelin
2016-01-22 18:15 ` Junio C Hamano
2016-01-22 18:47 ` Johannes Schindelin
2016-01-22 19:08 ` Junio C Hamano
2016-01-24 10:44 ` Johannes Schindelin
2016-01-22 19:50 ` Eric Sunshine
2016-01-22 19:52 ` Eric Sunshine
2016-01-24 10:37 ` Johannes Schindelin
2016-01-24 18:26 ` Eric Sunshine
2016-01-25 7:02 ` Johannes Schindelin
2016-01-23 6:31 ` Torsten Bögershausen
2016-01-24 10:39 ` Johannes Schindelin
2016-01-22 17:52 ` [PATCH 0/2] Let merge-file write out conflict markers with correct EOLs Beat Bolli
2016-01-24 10:48 ` [PATCH v2 0/1] " Johannes Schindelin
2016-01-24 10:48 ` [PATCH v2 1/1] merge-file: let conflict markers match end-of-line style of the context Johannes Schindelin
2016-01-24 16:27 ` Torsten Bögershausen
2016-01-24 16:36 ` Torsten Bögershausen
2016-01-25 6:53 ` Johannes Schindelin
2016-01-25 19:45 ` Ramsay Jones [this message]
2016-01-26 8:54 ` Johannes Schindelin
2016-01-26 16:43 ` Ramsay Jones
2016-01-26 16:49 ` Johannes Schindelin
2016-01-24 22:09 ` [PATCH v2 0/1] Let merge-file write out conflict markers with correct EOLs Junio C Hamano
2016-01-25 7:25 ` Johannes Schindelin
2016-01-25 8:06 ` [PATCH v3 0/2] " Johannes Schindelin
2016-01-25 8:07 ` [PATCH v3 1/2] merge-file: let conflict markers match end-of-line style of the context Johannes Schindelin
2016-01-25 8:32 ` Torsten Bögershausen
2016-01-25 8:59 ` Johannes Schindelin
2016-01-25 20:12 ` Junio C Hamano
2016-01-26 9:04 ` Johannes Schindelin
2016-01-26 17:22 ` Junio C Hamano
2016-01-25 8:07 ` [PATCH v3 2/2] merge-file: ensure that conflict sections match eol style Johannes Schindelin
2016-01-25 9:20 ` Johannes Schindelin
2016-01-26 14:42 ` [PATCH v4 0/2] Let merge-file write out conflict markers with correct EOLs Johannes Schindelin
2016-01-26 14:42 ` [PATCH v4 1/2] merge-file: let conflict markers match end-of-line style of the context Johannes Schindelin
2016-01-26 18:23 ` Junio C Hamano
2016-01-26 21:14 ` Junio C Hamano
2016-01-27 7:58 ` Johannes Schindelin
2016-01-27 18:19 ` Junio C Hamano
2016-01-27 19:12 ` Johannes Schindelin
2016-01-27 19:32 ` Junio C Hamano
2016-01-28 7:55 ` Johannes Schindelin
2016-01-26 14:42 ` [PATCH v4 2/2] merge-file: ensure that conflict sections match eol style Johannes Schindelin
2016-01-27 16:37 ` [PATCH v5 0/2] Let merge-file write out conflict markers with correct EOLs Johannes Schindelin
2016-01-27 16:37 ` [PATCH v5 1/2] merge-file: let conflict markers match end-of-line style of the context Johannes Schindelin
2016-01-27 16:37 ` [PATCH v5 2/2] merge-file: ensure that conflict sections match eol style Johannes Schindelin
2016-01-27 20:22 ` [PATCH v5 0/2] Let merge-file write out conflict markers with correct EOLs Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56A67B6F.60300@ramsayjones.plus.com \
--to=ramsay@ramsayjones$(echo .)plus.com \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=dev+git@drbeat$(echo .)li \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=peff@peff$(echo .)org \
--cc=sunshine@sunshineco$(echo .)com \
--cc=tboegi@web$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox