Hi, Thanks for taking a look! On Sun, Aug 8, 2010 at 2:01 PM, Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> wrote: > On Sun, Aug 8, 2010 at 19:04, Elijah Newren <newren@xxxxxxxxx> wrote: <snip> >> + perl -pi -e s/5/43/ stuff && >> + git commit -a -m "5->43" && >> + perl -pi -e s/6/42/ stuff && > > Please use sed so the test doesn't depend on perl being present. The original series used 'sed -i', but I found out that is apparently not portable. Should I use sed + a temporary file + mv? <snip> >> +test_expect_success 'setup for avoiding reapplying old patches' ' >> + (cd dst && >> + (git rebase --abort || true) && > > If you're ignoring the git rebase --abort return value: > > (cd dst && > git rebase --abort; > git reset ...) Makes sense; I'll do that. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html