On Thursday 28 August 2008, Mark Levedahl wrote: > Johan Herland wrote: > > I'd like to fix this, but I'm not sure whether the fix belongs in > > builtin-clone.c (i.e. making sure the origin URL is always "correct" > > wrt. resolving relative submodule URLs), or in git-submodule.sh (i.e. > > adding smarts when resolving relative submodule URLs against the > > super-repo's origin URL). > > I think the right approach is to start with clone and make it record the > real url it is using, regardless of what was input. The problem with > doing this in submodule is that in effect this replicates the search > logic clone would use, and furthermore could lead to nasty surprises by > grabbing the wrong submodule in an extreme case of having two > identically named repositories in different locations on a server. Thanks for your input. I looked into builtin-clone, and how to make it write the real origin URL for remote repos (it already does this today for local repos). But AFAICS, there's no way to get this information from the transport layer. I assume that the actual repo location is resolved on the remote side, and simply not communicated back to the local side. Also, after thinking some more about this, I'm unsure of the practical implications of this. Let's assume we can actually make "git clone" write the real URL in all cases (i.e. typically "repo.git" for bare repos and "repo/.git" for non-bare repos): If we simply resolve submodule URLs against the _repo_ (i.e. the real origin URL) and not the work tree (if any), we get results that are coupled to whether we use bare or non-bare repos: Take, for example, your use of "../<path>" to make submodules live outside the (bare) superproject. If I now create a non-bare clone of this, I must move the submodule repos _into_ my work tree, so that the submodule repos are available, if someone tries to clone from me. Additionally, when making super/sub repos available for others, I must make a mental effort to interpret the relative submodule URLs in .gitmodules against - NOT the work tree in which .gitmodules is located - but rather against the .git directory which is (most often) one directory level further down from the .gitmodules file. Maybe the easiest solution is to add a new config directive called something like "core.submodules.baseUrl". When set, relative submodule URLs would be resolved against this instead of the origin URL. When unset, the origin URL is used as a fallback. Hmm? Still, it would be nice to have intuitive and consistent behaviour by default, though... > I was about to create a patch for submodule to always remove trailing > "/.git" before resolving, but in fact a user could put the submodule > .git into the superproject's .git, in a non-bare repository, and then > gitlink that in the checked out submodule. So, it may also be good to > define and enforce rules on how relative url naming can be used for this > purpose. So far, I have only used it for bare repositories using the > "../<path> form keeping the submodules out of the superproject. Yes, duplication of such logic is probably a bad idea. Would it be better to consolidate all this URL DWIMming in one place which is #included from builtin-clone, git-submodule, git-fetch, and other commands that need this functionality? In any case, defining the rules for how relative submodule URLs are supposed to work would certainly make a good step in the right direction. Have fun! :) ...Johan PS: Here are the beginning of a test case for codifying the rules of relative submodule URL behaviour. Needless to say, the last testcase currently fails: diff --git a/t/t7403-submodule-relative.sh b/t/t7403-submodule-relative.sh new file mode 100755 index 0000000..9c12248 --- /dev/null +++ b/t/t7403-submodule-relative.sh @@ -0,0 +1,60 @@ +#!/bin/sh +# +# Copyright (c) 2008 Johan Herland +# + +test_description='Testing repos with relative submodule URLs + +This test tries to verify the sanity of working with relative submodule URLs. +' + +. ./test-lib.sh + +TRASH_DIR=$(pwd) + +# +# Test setup: +# - create the following super-/sub-repository hierarchy: +# / +# /file +# /a submodule/ +# /a submodule/file +# +test_expect_success 'setup' ' + + echo file > file && + git add file && + test_tick && + git commit -m initial && + test_tick && + git clone . "a submodule" && + cat >.gitmodules <<EOF && +[submodule "a submodule"] + path = "a submodule" + url = "./a submodule" +EOF + git add "a submodule" .gitmodules && + git commit -m "a submodule" + +' + +test_expect_success 'Cloning repo and updating submodules using file:// URL' ' + + git clone "file://$TRASH_DIR" clone && + cd clone && + git submodule update --init && + test -d "a submodule/.git" + +' + +test_expect_success 'Cloning repo and updating submodules using local path' ' + + rm -rf clone && + git clone "$TRASH_DIR" clone && + cd clone && + git submodule update --init && + test -d "a submodule/.git" + +' + +test_done -- Johan Herland, <johan@xxxxxxxxxxx> www.herland.net -- 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
