From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jens Lehmann Subject: Re: [PATCH 00/14] Add submodule test harness Date: Tue, 08 Jul 2014 21:34:21 +0200 Message-ID: <53BC47BD.1000705@web.de> References: <539DD029.4030506@web.de> <53B41D42.2090805@web.de> <53B46425.3030000@web.de> <53B4F0AA.10809@web.de> <53B5C7AC.4040701@web.de> <53BAF7AF.4020901@web.de> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Git Mailing List To: =?ISO-8859-1?Q?Torsten_B=F6gershausen?= , Junio C Hamano X-From: git-owner@vger.kernel.org Tue Jul 08 21:36:09 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1X4bBN-0004tf-2I for gcvg-git-2@plane.gmane.org; Tue, 08 Jul 2014 21:36:05 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756735AbaGHTe2 convert rfc822-to-quoted-printable (ORCPT ); Tue, 8 Jul 2014 15:34:28 -0400 Received: from mout.web.de ([212.227.15.3]:49438 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756022AbaGHTe0 (ORCPT ); Tue, 8 Jul 2014 15:34:26 -0400 Received: from [192.168.178.41] ([84.132.191.219]) by smtp.web.de (mrweb004) with ESMTPSA (Nemesis) id 0MGCm7-1WrATZ0KvP-00FAos; Tue, 08 Jul 2014 21:34:22 +0200 User-Agent: Mozilla/5.0 (X11; Linux i686 on x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 In-Reply-To: <53BAF7AF.4020901@web.de> X-Enigmail-Version: 1.6 X-Provags-ID: V03:K0:ROq86TekfIIBSNJDm+iDRd28MmMQdFiB8myyxRtdP2vi9yyDoh6 6M41yPU1VqnALvt3hvMwLAErAGjZ86UKBiv3kHhauaiWKalI7BK0Oi2AzGSBMqTv/Ea0167 WnaIO+jeSlrMEh0eMUvXy7NggUyaRsxvLcX6dzZvr/8WTT3aGmMzYWdR9mq2iQx3DXU0uOc Xma9UMJjVLcCsuEiwYnqQ== Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Am 07.07.2014 21:40, schrieb Torsten B=F6gershausen: > On 2014-07-07 19.05, Junio C Hamano wrote: >> Jens Lehmann writes: >> >>> Junio, do you want me to resend 02/14 without the non-portable "ech= o -n" >>> or could you just squash the following diff in? >> >> Amended locally here already; thanks, both. >=20 > There seems to be some other trouble under Mac OS, not yet fully trac= ked 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 =3D ../../../sub1 8a8 > worktree =3D ../../../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.worktr= ee in the test_git_directory_is_unchanged function just before the "diff -= r", but only under Mac OS. > And Msysgit complains=20 > error: fchmod on c:/xxxt/trash directory.t7613-merge-submodule/submod= ule_update_repo/.git/modules/sub1/config.lock failed: Function not impl= emented 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).