Hi Phillip, On Wed, 31 May 2017, Phillip Wood wrote: > From: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> > > 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. The last line of the sed script should be > +s/^M/\\r/g Like Junio pointed out, this sed script would not be portable. To elaborate: there are two major variants of sed out there, GNU sed and BSD sed. Typically GNU sed allows a little more powerful instructions, e.g. \t and \r. But we should simply take a step back and ask why test_cmp is not enough to ignore the CRs in the output? Also, about the commit IDs. As long as the tests are consistent (i.e. they use test_commit rather than plain `git commit`, or at least call `test_tick` beforehand), the commit IDs should actually be identical between runs and not depend on the time of day or the date. The only exception to that rule is when some previous test cases call `test_commit` but are guarded behind some prereq and may not be executed at all. In that case, the precise commit IDs depend on the particular set of active prereqs. But as far as I can tell, t3420 does not have any test cases guarded by prereqs. Taking an additional step back, I wonder whether we have to hard-code the commit IDs (or XXX) to begin with. Why not generate the `expect` files with the information at hand? We can simply ask `git rev-parse --short`. For the stash's commit ID, there is no record in the ref space, of course (because it was created with `git stash create`). But I think in this case, it is legitimate to simply grep the output. That way, the test would be precise and resilient. So for example instead of adding the t/t3420/expected-success-am verbatim, you could generate the output via cat >expect <<-EOF $(grep "^Created autostash: [0-9a-f][0-9a-f]*\\$" output) HEAD is now at $(git rev-parse --short HEAD~2) third commit First, rewinding head to replay your work on top of it... Applying: second commit Applying: third commit Applied autostash. EOF Ciao, Johannes