From: Antonio Ospite <email@example.com> To: Jonathan Nieder <firstname.lastname@example.org> Cc: email@example.com, Richard Hartmann <firstname.lastname@example.org>, Stefan Beller <email@example.com>, Brandon Williams <firstname.lastname@example.org> Subject: Re: [RFC 00/10] Make .the gitmodules file path configurable Date: Mon, 30 Apr 2018 14:51:14 +0200 Message-ID: <email@example.com> (raw) In-Reply-To: <20180423174709.GA25128@aiede.svl.corp.google.com> On Mon, 23 Apr 2018 10:47:09 -0700 Jonathan Nieder <firstname.lastname@example.org> wrote: > Hi, > Hi Jonathan, thank you for your comment. > Antonio Ospite wrote: > > > vcsh uses bare git repositories and detached work-trees to manage > > *distinct* sets of configuration files directly into $HOME. > > Cool! I like the tooling you're creating for this, though keep in mind > that Git has some weaknesses as a tool for deployment. > I am not the author BTW, just a user trying to address the remaining corner cases. > In particular, keep in mind that when git updates a file, there is a > period of time while it is missing from the filesystem, which can be > problematic for dotfiles. > Thanks for the reminder, it may be worth mentioning this in vcsh documentation, however I don't have knowledge of users experiencing problems related to that. > [...] > > However when multiple repositories take turns using the same directory > > as their work-tree, and more than one of them want to use submodules, > > there could still be conflicts about the '.gitmodules' file because git > > hardcodes this path. > > > > For comparison, in case of '.gitignore' a similar conflict might arise, > > but git has alternative ways to specify exclude files, so vcsh solves > > this by setting core.excludesFile for each repository and track ignored > > files somewhere else (in ~/.gitignore.d/$VCSH_REPO_NAME). > > For reference: > > core.excludesFile > Specifies the pathname to the file that contains > patterns to describe paths that are not meant to be > tracked, in addition to .gitignore (per-directory) and > .git/info/exclude. Defaults to > $XDG_CONFIG_HOME/git/ignore. If $XDG_CONFIG_HOME is > either not set or empty, $HOME/.config/git/ignore is > used instead. See gitignore(5). > > Using this as a substitute for <worktree>/.gitignore is a bit of a > hack. It happens to work, though, so reading on. :) > > [...] > > So this series proposes a mechanism to set an alternative path for the > > submodules configuration file (from now on "gitmodules file"). > > I am nervous about this. I wonder if there is another way to > accomplish the goal. > > One possibility would be to handle the case where .gitmodules is > excluded by a sparse checkout specification and use .gitmodules from > the index in that case. Would that work for you? > Since part of the problem is that .gitmodules *collide* between repositories, a sparse-checkout approach make sense indeed. As discussed with Stefan Beller having git use .gitmodules from the index without the need to have it checked out should work for us.  https://www.spinics.net/lists/git/msg329153.html Ideally git should also be able to write to that file when it's not checked out (e.g. when running "git submodule add"), to save the user from tedious sparse/unsparse rounds when operating with submodules. As suggested by Stefan I'll first try to remove the hardcoded references to .gitmodules in git-submodule.sh adding a helper sub-command to access .gitmodules in a more robust way, and after that git could be taught to use the file from the index, but this second part is currently beyond my current git knowledge. If this mechanism of using unchecked-out files from the index could be extended to .gitignore (and .gitattributes), then vcsh might even stop abusing core.excludesFile; sparse checkouts seem the more natural git way to deal with colliding files in a shared-workdir scenario. However, having users *write* to .gitignore and .gitattributes while they are not checked out still sounds quite problematic to me, but maybe this could be handled by vcsh itself, similarly to what is done for the file pointed by core.excludesFile. Ciao, Antonio -- Antonio Ospite https://ao2.it https://twitter.com/ao2it A: Because it messes up the order in which people normally read text. See http://en.wikipedia.org/wiki/Posting_style Q: Why is top-posting such a bad thing?
prev parent reply index Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-04-12 22:20 Antonio Ospite 2018-04-12 22:20 ` [RFC 01/10] submodule: add 'core.submodulesFile' to override the '.gitmodules' path Antonio Ospite 2018-04-12 23:50 ` Stefan Beller 2018-04-16 16:37 ` Antonio Ospite 2018-04-16 21:22 ` Stefan Beller 2018-04-18 11:43 ` Antonio Ospite 2018-04-18 18:44 ` Stefan Beller 2018-04-12 22:20 ` [RFC 02/10] submodule: fix getting custom gitmodule file in fetch command Antonio Ospite 2018-04-12 23:55 ` Stefan Beller 2018-04-16 16:18 ` Antonio Ospite 2018-04-16 19:23 ` Stefan Beller 2018-04-16 20:46 ` Antonio Ospite 2018-04-12 22:20 ` [RFC 03/10] submodule: use the 'submodules_file' variable in output messages Antonio Ospite 2018-04-12 22:20 ` [RFC 04/10] submodule: document 'core.submodulesFile' and fix references to '.gitmodules' Antonio Ospite 2018-04-12 22:20 ` [RFC 05/10] submodule: adjust references to '.gitmodules' in comments Antonio Ospite 2018-04-12 22:20 ` [RFC 06/10] completion: add 'core.submodulesfile' to the git-completion.bash file Antonio Ospite 2018-04-12 23:36 ` [RFC 00/10] Make .the gitmodules file path configurable Stefan Beller 2018-04-16 11:33 ` Antonio Ospite 2018-04-16 19:22 ` Stefan Beller 2018-04-13 8:07 ` Antonio Ospite 2018-04-13 8:07 ` [RFC 07/10] FIXME: wrap-for-bin.sh: set 'core.submodulesFile' for each git invocation Antonio Ospite 2018-04-13 8:07 ` [RFC 08/10] FIXME: submodule: fix t1300-repo-config.sh to take into account the new config Antonio Ospite 2018-04-13 8:07 ` [RFC 09/10] FIXME: submodule: pass custom gitmodules file to 'test-tool submodule-config' Antonio Ospite 2018-04-13 8:07 ` [RFC 10/10] FIXME: add a hacky script to test the changes with a patched test suite Antonio Ospite 2018-04-13 20:05 ` [RFC 07/10] FIXME: wrap-for-bin.sh: set 'core.submodulesFile' for each git invocation Stefan Beller 2018-04-16 11:36 ` Antonio Ospite 2018-04-23 17:47 ` [RFC 00/10] Make .the gitmodules file path configurable Jonathan Nieder 2018-04-30 12:51 ` Antonio Ospite [this message]
Reply instructions: You may reply publically 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 \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ /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
firstname.lastname@example.org mailing list mirror (one of many) Archives are clonable: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.org/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ or Tor2web: https://www.tor2web.org/ AGPL code for this site: git clone https://public-inbox.org/ public-inbox