Am 07.07.2014 21:40, schrieb Torsten Bögershausen: > On 2014-07-07 19.05, Junio C Hamano wrote: >> Jens Lehmann <Jens.Lehmann@xxxxxx> writes: >> >>> Junio, do you want me to resend 02/14 without the non-portable "echo -n" >>> or could you just squash the following diff in? >> >> Amended locally here already; thanks, both. > > There seems to be some other trouble under Mac OS, not yet fully tracked down, > (may be related to the "diff -r") Torsten sees failures of this kind under Mac OS: diff -r .git/modules/sub1/config sub1/.git/config 6d5 < worktree = ../../../sub1 8a8 > worktree = ../../../sub1 So the config contains the same content, but the worktree setting moved to a different line. This seems to be the result of setting core.worktree in the test_git_directory_is_unchanged function just before the "diff -r", but only under Mac OS. > And Msysgit complains > error: fchmod on c:/xxxt/trash directory.t7613-merge-submodule/submodule_update_repo/.git/modules/sub1/config.lock failed: Function not implemented I'm not sure what this is about, seems to happen during the "cp -R" of the repo under .git/modules into the submodule. I'm currently investigating both issues (the next steps probably being to install msysgit and to do some Git hacking on a Mac in the family). -- 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