From: Antoine Pelisse Date: Thu, 14 Mar 2013 15:51:10 GMT Subject: Re: [PATCH] Allow combined diff to ignore white-spaces Message-ID: In-Reply-To: <7v7glayp4l.fsf@alter.siamese.dyndns.org> On Thu, Mar 14, 2013 at 4:31 PM, Junio C Hamano wrote: > Johannes Sixt writes: > >> This form of 'echo' is not sufficiently portable. How about: >> >> tr -d Q <<-\EOF >test && >> >> always coalesce >> eol space coalesce Q >> ... >> EOF > > Much better. > >>> +test_expect_success 'check combined output (no ignore space)' ' >>> + git show | test_i18ngrep "^-\s*eol spaces" && >>> ... >>> + git show | test_i18ngrep "^--\s*always coalesce" >> >> This loses the exit code of git show. We usually write this as >> >> git show >actual && >> grep "^- *eol spaces" && >> grep "^- *eol space coalesce" && >> ... >> >> (Same for later tests.) >> >> There is nothing i18n-ish in the test patterns. Use regular grep. >> >> BTW, there is compare_diff_patch() in diff-lib.sh. You can use it to >> compare diff output to expected output. Then you do not need a grep >> invocation for each line of the test file. > > All good suggestions. Thanks. OK Very good, I will resubmit tonight. I was indeed not really sure about the best way to test here. Thanks for the tips and confirmation ! Cheers,