On Wed, Jun 23, 2010 at 22:09, Junio C Hamano <gitster@xxxxxxxxx> wrote: > * ab/i18n (2010-06-15) 3 commits > . Add initial C, Shell and Perl gettext translations > . fixup! Add infrastructure > . Add infrastructure for translating Git with gettext > > The parts that touch other topics in flight probably need to be split into > separate patches; otherwise it is unmanageable. I've just submitted "[PATCH v5] Add infrastructure for translating Git with gettext" (<1277332338-8486-1-git-send-email-avarab@xxxxxxxxx>) that omits the "Add initial C, Shell and Perl gettext translations" patch. This'll greatly ease merging it with other topics. I can split it up further if you want, perhaps you'd like the changes to the Makefile to be in one seperate patch? Although I don't see how that makes it easier to merge since you'd have to solve that conflict anyway, but perhaps your workflow is different from mine. Tell me if I can do anything else to make it easier to merge it. > * ab/tap (2010-06-15) 5 commits > . TAP: Make sure there's a newline before "ok" under harness > . TAP: Say "pass" rather than "ok" on an empty line > . We use TAP so the Perl test can run without scaffolding > . Skip tests in a way that makes sense under TAP > . Make test-lib.sh emit valid TAP format > > Updated with a newer round but it seems to break "make -j8 test" when > merged to 'pu', hence ejected. How does it break under pu? I can't see any suspicious behavior when running it. I've run it with -j1 and -j8 in both next and pu and I get the same test test-results/ every time. > I was not sure why TAP is worth the trouble, and I still am not > sure. Covered in comments to a previous "What's cooking" post. -- 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