On Thu, Aug 12, 2010 at 09:23, Johannes Sixt <j.sixt@xxxxxxxxxxxxx> wrote: > [Sorry for the Cc spam; I lack the time to conduct individual messages.] > > I compiled many topics in pu and ran the test suite on Windows, A Windows smoker would be useful :) > Am 8/12/2010 1:35, schrieb Junio C Hamano: >> * en/rebase-against-rebase-fix (2010-08-06) 2 commits >> - pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches >> - t5520-pull: Add testcases showing spurious conflicts from git pull --rebase > > This should not use "sed -i" in the test suite. Another case for the modify() helper function I guess. >> * jn/apply-filename-with-sp (2010-07-23) 4 commits >> - apply: Handle traditional patches with space in filename >> - t4135 (apply): use expand instead of pr for portability >> - tests: Test how well "git apply" copes with weird filenames >> - apply: Split quoted filename handling into new function >> >> Looked Ok. Will merge to 'next'. > > The test cases that work with files with tabs must have a prerequisite; > see t3600-rm.sh. Hrm, another test with tabs in filenames. There are already three setting the TABS_IN_FILENAMES prereq, but I missed this one. I should probably move those checks into some prereq library, maybe to test-lib.sh itself. -- 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