Hi Junio, On Tue, 26 Jan 2016, Junio C Hamano wrote: > * js/mingw-tests (2016-01-26) 20 commits > - mingw: skip a test in t9130 that cannot pass on Windows > - mingw: do not bother to test funny file names > - mingw: handle the missing POSIXPERM prereq in t9124 > - mingw: avoid illegal filename in t9118 > - mingw: mark t9100's test cases with appropriate prereqs > - Avoid absolute path in t0008 > - mingw: work around pwd issues in the tests > - mingw: fix t9700's assumption about directory separators > - mingw: skip test in t1508 that fails due to path conversion > - tests: turn off git-daemon tests if FIFOs are not available > - mingw: disable mkfifo-based tests > - mingw: accomodate t0060-path-utils for MSYS2 > - mingw: fix t5601-clone.sh > - mingw: let lstat() fail with errno == ENOTDIR when appropriate > - mingw: try to delete target directory before renaming > - mingw: prepare the TMPDIR environment variable for shell scripts > - mingw: factor out Windows specific environment setup > - Git.pm: stop assuming that absolute paths start with a slash > - mingw: do not trust MSYS2's MinGW gettext.sh > - mingw: let's use gettext with MSYS2 > (this branch uses js/msys2.) > > Updates test scripts to remove assumptions that are not portable > between Git for POSIX and Git for Windows, or to skip ones with > expectations that are not satisfiable on Git for Windows. > > Looks mostly done, but I had to tweak a few things, so > Waiting for re-test. Will re-submit with additional tweaks. > * js/xmerge-maker-eol (2016-01-26) 2 commits > - merge-file: ensure that conflict sections match eol style > - merge-file: let conflict markers match end-of-line style of the context > > The low-level merge machinery has been taught to use CRLF line > termination when inserting conflict markers to merged contents that > are themselves CRLF line-terminated. > > Will merge to 'next'. There is one more tweak I introduced, and will resubmit: the test case did not test the intended 3 out of the 4 conflict markers. Ciao, Dscho -- 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