git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jens Lehmann <Jens.Lehmann@web.de>
To: "Torsten Bögershausen" <tboegi@web.de>,
	"Junio C Hamano" <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH 00/14] Add submodule test harness
Date: Tue, 08 Jul 2014 21:34:21 +0200	[thread overview]
Message-ID: <53BC47BD.1000705@web.de> (raw)
In-Reply-To: <53BAF7AF.4020901@web.de>

Am 07.07.2014 21:40, schrieb Torsten Bögershausen:
> On 2014-07-07 19.05, Junio C Hamano wrote:
>> Jens Lehmann <Jens.Lehmann@web.de> 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).

  reply	other threads:[~2014-07-08 19:36 UTC|newest]

Thread overview: 65+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-15 16:56 [PATCH 00/14] Add submodule test harness Jens Lehmann
2014-06-15 16:57 ` [PATCH 01/14] test-lib: add test_dir_is_empty() Jens Lehmann
2014-06-16 22:05   ` Junio C Hamano
2014-06-17 16:47     ` Jens Lehmann
2014-06-19 20:12   ` [PATCH v2 " Jens Lehmann
2014-06-15 16:58 ` [PATCH 02/14] submodules: Add the lib-submodule-update.sh test library Jens Lehmann
2014-06-16 22:49   ` Junio C Hamano
2014-06-17 17:33     ` Jens Lehmann
2014-06-17 18:44       ` Junio C Hamano
2014-06-17 20:46         ` Jens Lehmann
2014-06-17 21:05           ` Junio C Hamano
2014-06-19 20:12   ` [PATCH v2 " Jens Lehmann
2014-06-20 17:31     ` Junio C Hamano
2014-07-01 21:24       ` [PATCH v3 " Jens Lehmann
2014-06-15 16:58 ` [PATCH 03/14] checkout: call the new submodule update test framework Jens Lehmann
2014-06-15 16:59 ` [PATCH 04/14] apply: add t4137 for submodule updates Jens Lehmann
2014-06-15 16:59 ` [PATCH 05/14] read-tree: add t1013 " Jens Lehmann
2014-06-15 17:00 ` [PATCH 06/14] reset: add t7112 " Jens Lehmann
2014-06-15 17:01 ` [PATCH 07/14] bisect: add t6041 " Jens Lehmann
2014-06-19 20:12   ` [PATCH v2 " Jens Lehmann
2014-06-15 17:01 ` [PATCH 08/14] merge: add t7613 " Jens Lehmann
2014-06-15 17:02 ` [PATCH 09/14] rebase: add t3426 " Jens Lehmann
2014-06-16  9:57   ` Eric Sunshine
2014-06-17 17:41     ` Jens Lehmann
2014-06-19 20:12   ` [PATCH v2 " Jens Lehmann
2014-06-15 17:02 ` [PATCH 10/14] pull: add t5572 " Jens Lehmann
2014-06-15 17:03 ` [PATCH 11/14] cherry-pick: add t3512 " Jens Lehmann
2014-06-15 17:03 ` [PATCH 12/14] am: add t4255 " Jens Lehmann
2014-06-15 17:04 ` [PATCH 13/14] stash: add t3906 " Jens Lehmann
2014-06-19 20:12   ` [PATCH v2 " Jens Lehmann
2014-06-15 17:04 ` [PATCH 14/14] revert: add t3513 " Jens Lehmann
2014-06-19 20:12   ` [PATCH v2 " Jens Lehmann
2014-07-02 14:54 ` [PATCH 00/14] Add submodule test harness Torsten Bögershausen
2014-07-02 19:57   ` Jens Lehmann
2014-07-03  5:56     ` Torsten Bögershausen
2014-07-03 21:14       ` Jens Lehmann
2014-07-07 17:05         ` Junio C Hamano
2014-07-07 19:40           ` Torsten Bögershausen
2014-07-08 19:34             ` Jens Lehmann [this message]
2014-07-08 20:25               ` Ramsay Jones
2014-07-08 21:03                 ` Ramsay Jones
2014-07-09  6:39                 ` No fchmod() under msygit - Was: " Torsten Bögershausen
2014-07-09 20:00                   ` Eric Wong
2014-07-14 11:31                     ` Erik Faye-Lund
2014-07-14 13:55                       ` Nico Williams
2014-07-14 14:02                         ` Nico Williams
2014-07-14 19:30                     ` Karsten Blees
2014-07-14 21:18                       ` Junio C Hamano
2014-07-09  6:14               ` Torsten Bögershausen
2014-07-09 15:20                 ` Junio C Hamano
2014-07-09 18:19                 ` Jens Lehmann
2014-07-09 19:31                   ` Junio C Hamano
2014-07-10 20:52                     ` Junio C Hamano
2014-07-12 18:23                       ` Jens Lehmann
2014-07-14  1:01                         ` Junio C Hamano
2014-07-14 18:22                           ` Jens Lehmann
2014-07-14 21:18                             ` Junio C Hamano
2014-07-09 17:21               ` Johannes Sixt
2014-07-09 19:22                 ` Junio C Hamano
2014-07-09 19:56                   ` Eric Wong
2014-07-09 21:57                     ` Junio C Hamano
2014-07-10  6:22                       ` No fchmd. was: " Torsten Bögershausen
2014-07-10 19:49                         ` Junio C Hamano
2014-07-10 20:55                           ` Torsten Bögershausen
2014-07-10 21:43                             ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=53BC47BD.1000705@web.de \
    --to=jens.lehmann@web.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=tboegi@web.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).