On Sonntag, 8. August 2010, Elijah Newren wrote: > +test_expect_success 'setup for detecting upstreamed changes' ' > + mkdir src && > + (cd src && > + git init && > + for i in $(seq 1 10); do echo $i; done > stuff && We don't have seq on Windows. The sequence is short enough to list it explicitly. > + git add stuff && > + git commit -m "Initial revision" > + ) && > + git clone src dst && > + (cd src && > + perl -pi -e s/5/43/ stuff && perl -pi is no better than sed -i; it does not work on Windows because it tries to remove an open file (and that is a no-go on Windows). perl -pi.bak does work though. > + git commit -a -m "5->43" && > + perl -pi -e s/6/42/ stuff && > + git commit -a -m "Make it bigger" && > + correct=$(git rev-parse HEAD) > + ) && This assignment at the end of the subshell is pointless. > +test_expect_success 'setup for avoiding reapplying old patches' ' > + (cd dst && > + (git rebase --abort || true) && Perhaps: test_might_fail git rebase --abort && but I'm not sure whether that's the intended use of test_might_fail. > + git reset --hard origin/master > + ) && ... > +test_expect_failure 'git pull --rebase does not reapply old patches' ' > + (cd dst && > + (git pull --rebase || true) && Ditto. > + test 1 = $(find .git/rebase-apply -name "000*" | wc -l) > + ) > +' > + > test_done -- Hannes -- 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