Re: [PATCH alt-v3] Improve function dir.c:trim_trailing_spaces()

From: Pasha Bolokhov <pasha.bolokhov@gmail.com>
Date: Jun 14, 2014, 02:45 UTC
Message-ID: <CAKpPgvcwV_Zbd1W0gAGcy_A-bE6XZagXD-u4aMwOqhXMktUgWQ@mail.gmail.com>
In-Reply-To: <20140613232537.GB23078@sigill>

Thanks for the fix. I knew these backslashes could cause trouble. No doubt the fixed version reads better than a hundred backslashes

On Fri, Jun 13, 2014 at 4:25 PM, Jeff King <peff@peff.net> wrote:

Show 35 quoted lines

> On Fri, Jun 13, 2014 at 01:23:47PM -0700, Junio C Hamano wrote:
>
>> This passes with your shell set to dash but fails with bash.
>>
>> Let's fix it up like so.
>
> Thanks, I should have been more suspicious of the combination of backslashes
> and echo during review. :)
>
>> diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh
>> index 5ef5ad3..39e55a1 100755
>> --- a/t/t0008-ignores.sh
>> +++ b/t/t0008-ignores.sh
>> @@ -816,12 +816,14 @@ test_expect_success NOT_MINGW,NOT_CYGWIN 'correct handling of backslashes' '
>>       >"whitespace/trailing 5 \\ \\ " &&
>>       >"whitespace/trailing 6 \\a\\" &&
>>       >whitespace/untracked &&
>> -     echo "whitespace/trailing 1 \\    " >ignore  &&
>> -     echo "whitespace/trailing 2 \\\\\\\\\\\\\\\\" >>ignore &&
>> -     echo "whitespace/trailing 3 \\\\\\\\\\\\\\\\ " >>ignore &&
>> -     echo "whitespace/trailing 4   \\\\\\\\\\\\    " >>ignore &&
>> -     echo "whitespace/trailing 5 \\\\\\\\ \\\\\\\\\\\\   " >>ignore &&
>> -     echo "whitespace/trailing 6 \\\\\\\\a\\\\\\\\" >>ignore &&
>> +     sed -e "s/Z$//" >ignore <<-\EOF &&
>> +     whitespace/trailing 1 \    Z
>> +     whitespace/trailing 2 \\\\Z
>> +     whitespace/trailing 3 \\\\ Z
>> +     whitespace/trailing 4   \\\    Z
>> +     whitespace/trailing 5 \\ \\\   Z
>> +     whitespace/trailing 6 \\a\\Z
>> +     EOF
>
> The end result is much more readable, too, IMHO.
>
> -Peff