From: Junio C Hamano Date: Thu, 01 Jun 2017 01:59:26 GMT Subject: Re: [PATCH 2/3] rebase: Add tests for console output Message-ID: In-Reply-To: <39cd140a-4ba1-f3ee-d945-bf43199d4a82@talktalk.net> Phillip Wood writes: > On 31/05/17 11:42, Phillip Wood wrote: >> From: Phillip Wood >> >> Check the console output when using --autostash and the stash applies >> cleanly is what we expect. To avoid this test depending on commit and >> stash hashes it uses sed to replace them with XXX. The sed script also >> replaces carriage returns in the output with '\r' to avoid embedded >> '^M's in the expected output files. Unfortunately this means we still >> end up with an embedded '^M' in the sed script which may not be >> preserved when sending this. Or such a sed script may simply be not portable.