On Sat, May 31, 2014 at 12:36 AM, Jeff King <peff@xxxxxxxx> wrote: > From: Nick Alcock <nick.alcock@xxxxxxxxxx> > > As 0232852b, but for the push tests instead: this avoids a start_httpd > in the middle of the file, which fails under GIT_TEST_HTTPD=false. > > Note that we have to munge the test in a few ways while > moving it: > > 1. We drop the `test -z "$GIT_TEST_HTTPD"` check; this is > too simplistic since 83d842d, and we should let > lib-httpd.sh handle it. > > 2. We have to port over some of the old setup from t5538. > > 3. In the final test, we no longer expect the extra commit > "1" built on top of "4". This was a side effect from an > earlier test in t5538 which was not ported over. > > Signed-off-by: Nick Alcock <nick.alcock@xxxxxxxxxx> > Signed-off-by: Jeff King <peff@xxxxxxxx> > --- > Here it is with the fixups I suggested in the last email. This passes > for me, but I'd love to have a sanity check from Duy. Looks good. -- Duy -- 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