For the original cover letter, see https://lore.kernel.org/git/20210611225428.1208973-1-emilyshaffer%40google.com. The CI run is here: https://github.com/nasamuffin/git/actions/runs/1423475715 It shows a broken (pedantic,fedora) test, but those are known broken: https://lore.kernel.org/git/nycvar.QRO.7.76.6.2111040007170.56%40tvgsbejvaqbjf.bet [v4 cover letter] Since v3, a pretty major change: the semantics of submodule.superprojectGitDir has changed, to point from the submodule's gitdir to the superproject's gitdir (in v3 and earlier, we kept a path from the submodule's *worktree* to the superproject's gitdir instead). This cleans up some of the confusions about the behavior when a submodule worktree moves around in the superproject's tree, or in a future when we support submodules having multiple worktrees. I also tried to simplify the tests to use 'test-tool path-utils relative_path' everywhere - I think that makes them much more clear for a test reader, but if you're reviewing and it isn't obvious what we're testing for, please speak up. I think this is pretty mature and there was a lot of general agreement that the gitdir->gitdir association was the way to go, so please be brutal and look for nits, leaks, etc. this round ;) [/v4 cover letter] Since v4: The only real change here is a slight semantics change to map from <submodule gitdir> to <superproject common git dir>. In every case *except* for when the superproject has a worktree, this changes nothing. For the case when the superproject has a worktree, this means that now submodules will refer to the general superproject common dir (e.g. no worktree-specific refs or configs or whatnot). I *think* that because a submodule should exist in the context of the common dir, not the worktree gitdir, that is ok. However, it does mean it would be difficult to do something like sharing a config specific to the worktree (the initial goal of this series). $ROOT/.git $ROOT/.git/config.superproject <- shared by $ROOT/.git/modules/sub $ROOT/.git/modules/sub <- points to $ROOT/.git $ROOT/.git/worktrees/wt $ROOT/.git/worktrees/wt/config.superproject <- contains a certain config-based pre-commit hook If the submodule only knows about the common dir, that is tough, because the submodule would basically have to guess which worktree it's in from its own path. There would be no way for '$WT/sub' to inherit '$ROOT/.git/worktrees/wt/config.superproject'. That said... right now, we don't support submodules in worktrees very well at all. A submodule in a worktree will get a brand new gitdir in $ROOT/.git/worktrees/modules/ (and that brand new gitdir would point to the super's common dir). So I think we can punt on this entire question until we teach submodules and worktrees to play more gracefully together (it's on my long list...), and at that time we can probably introduce a pointer from $ROOT/.git/modules/sub/worktrees/wt/ to $ROOT/.git/worktrees/wt/.... Or, to summarize the long ramble above: "this is still kind of weird with worktrees, but let's fix it later when we fix worktrees more thoroughly". (More rambling about worktree weirdness here: https://lore.kernel.org/git/YYRaII8YWVxlBqsF%40google.com ) - Emily Emily Shaffer (4): t7400-submodule-basic: modernize inspect() helper introduce submodule.superprojectGitDir record submodule: record superproject gitdir during absorbgitdirs submodule: record superproject gitdir during 'update' Documentation/config/submodule.txt | 12 +++++++ builtin/submodule--helper.c | 4 +++ git-submodule.sh | 14 ++++++++ submodule.c | 9 +++++ t/t7400-submodule-basic.sh | 54 ++++++++++++++++-------------- t/t7406-submodule-update.sh | 12 +++++++ t/t7412-submodule-absorbgitdirs.sh | 50 +++++++++++++++++++++++++-- 7 files changed, 128 insertions(+), 27 deletions(-) Range-diff against v4: 1: 2ff151aaa2 = 1: 6ff10beaf2 t7400-submodule-basic: modernize inspect() helper 2: ed5479ad5d ! 2: d4f4627585 introduce submodule.superprojectGitDir record @@ Commit message superproject directory around on the filesystem without breaking the submodule's cache. And by using the path from gitdir to gitdir, we can move the submodule within the superproject's tree structure without - breaking the submodule's cache, too. + breaking the submodule's cache, too. Finally, by pointing at + "get_git_common_dir()" instead of "get_git_dir()", we ensure the link + will refer to the parent repo, not to a specific worktree. Since this hint value is only introduced during new submodule creation via `git submodule add`, though, there is more work to do to allow the @@ Documentation/config/submodule.txt: submodule.alternateErrorStrategy:: + +submodule.superprojectGitDir:: + The relative path from the submodule's gitdir to its superproject's -+ gitdir. When Git is run in a repository, it usually makes no difference -+ whether this repository is standalone or a submodule, but if this -+ configuration variable is present, additional behavior may be possible, -+ such as "git status" printing additional information about this -+ submodule's status with respect to its superproject. This config should -+ only be present in projects which are submodules, but is not guaranteed -+ to be present in every submodule, so only optional value-added behavior -+ should be linked to it. It is set automatically during -+ submodule creation. ++ common dir. When Git is run in a repository, it usually makes no ++ difference whether this repository is standalone or a submodule, but if ++ this configuration variable is present, additional behavior may be ++ possible, such as "git status" printing additional information about ++ this submodule's status with respect to its superproject. This config ++ should only be present in projects which are submodules, but is not ++ guaranteed to be present in every submodule, so only optional ++ value-added behavior should be linked to it. It is set automatically ++ during submodule creation. ## builtin/submodule--helper.c ## @@ builtin/submodule--helper.c: static int clone_submodule(struct module_clone_data *clone_data) @@ builtin/submodule--helper.c: static int clone_submodule(struct module_clone_data error_strategy); + git_config_set_in_file(p, "submodule.superprojectGitdir", -+ relative_path(absolute_path(get_git_dir()), ++ relative_path(absolute_path(get_git_common_dir()), + sm_gitdir, &sb)); + free(sm_alternate); @@ t/t7400-submodule-basic.sh: submodurl=$(pwd -P) + # Ensure that submodule.superprojectGitDir contains the path from the + # submodule's gitdir to the superproject's gitdir. + -+ super_abs_gitdir=$(git -C "$super_dir" rev-parse --absolute-git-dir) && -+ sub_abs_gitdir=$(git -C "$sub_dir" rev-parse --absolute-git-dir) && ++ super_abs_gitdir=$(git -C "$super_dir" rev-parse --path-format=absolute --git-common-dir) && ++ sub_abs_gitdir=$(git -C "$sub_dir" rev-parse --path-format=absolute --git-common-dir) && + + [ "$(git -C "$sub_dir" config --get submodule.superprojectGitDir)" = \ + "$(test-tool path-utils relative_path "$super_abs_gitdir" \ 3: 60e6cf77c5 ! 3: 2dae297943 submodule: record superproject gitdir during absorbgitdirs @@ Commit message Already during 'git submodule add' we record a pointer to the superproject's gitdir. However, this doesn't help brand-new submodules created with 'git init' and later absorbed with 'git - submodule absorbgitdir'. Let's start adding that pointer during 'git - submodule absorbgitdir' too. + submodule absorbgitdirs'. Let's start adding that pointer during 'git + submodule absorbgitdirs' too. Signed-off-by: Emily Shaffer <emilyshaffer@xxxxxxxxxx> @@ submodule.c: static void relocate_single_git_dir_into_superproject(const char *p relocate_gitdir(path, real_old_git_dir, real_new_git_dir); + /* cache pointer to superproject's gitdir */ -+ /* NEEDSWORK: this may differ if experimental.worktreeConfig is enabled */ + strbuf_addf(&config_path, "%s/config", real_new_git_dir); + git_config_set_in_file(config_path.buf, "submodule.superprojectGitdir", -+ relative_path(absolute_path(get_git_dir()), ++ relative_path(absolute_path(get_git_common_dir()), + real_new_git_dir, &sb)); + + strbuf_release(&config_path); @@ t/t7412-submodule-absorbgitdirs.sh: test_expect_success 'absorb the git dir' ' + test_cmp expect.2 actual.2 && + + # make sure the submodule cached the superproject gitdir correctly -+ submodule_gitdir="$(git -C sub1 rev-parse --absolute-git-dir)" && -+ superproject_gitdir="$(git rev-parse --absolute-git-dir)" && ++ submodule_gitdir="$(git -C sub1 rev-parse --path-format=absolute --git-common-dir)" && ++ superproject_gitdir="$(git rev-parse --path-format=absolute --git-common-dir)" && + + test-tool path-utils relative_path "$superproject_gitdir" \ + "$submodule_gitdir" >expect && @@ t/t7412-submodule-absorbgitdirs.sh: test_expect_success 'absorb the git dir in a - test_cmp expect.2 actual.2 + test_cmp expect.2 actual.2 && + -+ sub1_gitdir="$(git -C sub1 rev-parse --absolute-git-dir)" && -+ sub1_nested_gitdir="$(git -C sub1/nested rev-parse --absolute-git-dir)" && ++ sub1_gitdir="$(git -C sub1 rev-parse --path-format=absolute --git-common-dir)" && ++ sub1_nested_gitdir="$(git -C sub1/nested rev-parse --path-format=absolute --git-common-dir)" && + + test-tool path-utils relative_path "$sub1_gitdir" "$sub1_nested_gitdir" \ + >expect && @@ t/t7412-submodule-absorbgitdirs.sh: test_expect_success 'absorb the git dir in a ' test_expect_success 're-setup nested submodule' ' +@@ t/t7412-submodule-absorbgitdirs.sh: test_expect_success 'absorbing fails for a submodule with multiple worktrees' ' + test_i18ngrep "not supported" error + ' + ++test_expect_success 'absorbgitdirs works when called from a superproject worktree' ' ++ # set up a worktree of the superproject ++ git worktree add wt && ++ ( ++ cd wt && ++ ++ # create a new unembedded git dir ++ git init sub4 && ++ test_commit -C sub4 first && ++ git submodule add ./sub4 && ++ test_tick && ++ ++ # absorb the git dir ++ git submodule absorbgitdirs sub4 && ++ ++ # make sure the submodule cached the superproject gitdir correctly ++ submodule_gitdir="$(git -C sub4 rev-parse --path-format=absolute --git-common-dir)" && ++ superproject_gitdir="$(git rev-parse --path-format=absolute --git-common-dir)" && ++ ++ test-tool path-utils relative_path "$superproject_gitdir" \ ++ "$submodule_gitdir" >expect && ++ git -C sub4 config submodule.superprojectGitDir >actual && ++ ++ test_cmp expect actual ++ ) ++' ++ + test_done 4: df9879ff93 ! 4: f0412d6d34 submodule: record superproject gitdir during 'update' @@ git-submodule.sh: cmd_update() ;; esac -+ # Cache a pointer to the superproject's gitdir. This may have ++ # Cache a pointer to the superproject's common dir. This may have + # changed, unless it's a fresh clone. Writes it to worktree + # if applicable, otherwise to local. + if test -z "$just_cloned" @@ git-submodule.sh: cmd_update() + sm_gitdir="$(git -C "$sm_path" rev-parse --absolute-git-dir)" + relative_gitdir="$(git rev-parse --path-format=relative \ + --prefix "${sm_gitdir}" \ -+ --git-dir)" ++ --git-common-dir)" + + git -C "$sm_path" config --worktree \ + submodule.superprojectgitdir "$relative_gitdir" @@ t/t7406-submodule-update.sh: test_expect_success 'submodule update --quiet passe + git -C submodule config --unset submodule.superprojectGitdir && + git submodule update && + test-tool path-utils relative_path \ -+ "$(git rev-parse --absolute-git-dir)" \ -+ "$(git -C submodule rev-parse --absolute-git-dir)" >expect && ++ "$(git rev-parse --path-format=absolute --git-common-dir)" \ ++ "$(git -C submodule rev-parse --path-format=absolute --git-common-dir)" >expect && + git -C submodule config submodule.superprojectGitdir >actual && + test_cmp expect actual + ) -- 2.34.0.rc0.344.g81b53c2807-goog
