For the original cover letter, see https://lore.kernel.org/git/20210611225428.1208973-1-emilyshaffer%40google.com. CI run: https://github.com/nasamuffin/git/actions/runs/1954710601 Since v8: Only a couple of minor fixes. Junio pointed out that I could write the tests better using --type=bool and 'test_cmp_config', and that we could be a little more careful about when to give up on 'git rev-parse --show-superproject-working-dir'. Glen mentioned that builtin/submodule--helper.c:run_update_procedure() is called unconditionally earlier in the same function where I had added the config in git-submodule.sh. So, I moved the config set into submodule--helper.c to reduce possible edge cases where the config might not be set. Otherwise, this series is pretty much unchanged. Since v7: Actually a fairly large rework. Rather than keeping the path from gitdir to gitdir, just keep a boolean under 'submodule.hasSuperproject'. The idea is that from this boolean, we can decide whether to traverse the filesystem looking for a superproject. Because this simplifies the implementation, I compressed the three middle commits into one. As proof-of-concept, I added a patch at the end to check for this boolean when running `git rev-parse --show-superproject-working-tree`. One thing I'm not sure about: in the tests, I check whether the config is set, but not what the boolean value of it is. Is there a better way to do that? For example, I could imagine someone deciding to set `submodule.hasSuperproject = false` and the tests would not function correctly in that case. I think we don't really normalize the value on a boolean config like that, so I didn't want to write a lot of comparison to check if the value is 1 or true or True or TRUE or Yes or .... Am I overthinking it? The other thing I'm not sure about: since it's just a bool, we're not restricted to setting this config only when we have both gitdir paths available. That makes me want to set the config any time we are doing something with submodules anyway, like any time 'git-submodule--helper' is used. But that helper seems to be called in the context of the superproject, not of the submodules, so adding this config for each submodule we touch would be a second child process. Is there some other common entry point for submodules that we can use? - Emily Since v6: I've dropped the fifth commit to use this new config for `git rev-parse --show-superproject-working-tree`. I think it did more harm than good - that tool uses an odd way to determine whether the superproject is actually the superproject, anyways. I poked a little bit at trying to find some benchmark to demonstrate that "submodule.superprojectGitDir" is actually faster - but I didn't end up able to write one without writing a ton of new code to traverse the filesystem. To be honest, I'm not all that interested in performance - I want the config added for correctness, instead. So, the only real changes between v6 and v7 are some documentation changes suggested by Jonathan Tan (https://lore.kernel.org/git/20211117234300.2598132-1-jonathantanmy%40google.com). Since v5: A couple things. Firstly, a semantics change *back* to the semantics of v3 - we map from gitdir to gitdir, *not* from common dir to common dir, so that theoretically a submodule with multiple worktrees in multiple superproject worktrees will be able to figure out which worktree of the superproject it's in. (Realistically, that's not really possible right now, but I'd like to change that soon.) Secondly, a rewording of comments and commit messages to indicate that this isn't a cache of some expensive operation, but rather intended to be the source of truth for all submodules. I also added a fifth commit rewriting `git rev-parse --show-superproject-working-tree` to demonstrate what that means in practice - but from a practical standpoint, I'm a little worried about that fifth patch. More details in the patch 5 description. I did discuss Ævar's idea of relying on in-process filesystem digging to find the superproject's gitdir with the rest of the Google team, but in the end decided that there are some worries about filesystem digging in this way (namely, some ugly interactions with network drives that are actually already an issue for Googler Linux machines). Plus, the allure of being able to definitively know that we're a submodule is pretty strong. ;) But overall, this is the direction I'd prefer to keep going in, rather than trying to guess from the filesystem going forward. 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 ) 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] Emily Shaffer (3): t7400-submodule-basic: modernize inspect() helper introduce submodule.hasSuperproject record rev-parse: short-circuit superproject worktree when config unset Documentation/config/submodule.txt | 6 ++++ builtin/submodule--helper.c | 11 +++++++ submodule.c | 30 ++++++++++++++++++ t/t1500-rev-parse.sh | 10 +++++- t/t7400-submodule-basic.sh | 42 ++++++++++++------------- t/t7406-submodule-update.sh | 8 +++++ t/t7412-submodule-absorbgitdirs.sh | 50 ++++++++++++++++++++++++++++-- 7 files changed, 131 insertions(+), 26 deletions(-) Range-diff against v8: -: ---------- > 1: 251510c687 t7400-submodule-basic: modernize inspect() helper 1: 34cbfd81ee ! 2: da01dc7c10 introduce submodule.hasSuperproject record @@ builtin/submodule--helper.c: static int clone_submodule(struct module_clone_data free(sm_alternate); free(error_strategy); - - ## git-submodule.sh ## -@@ git-submodule.sh: cmd_update() - ;; - esac +@@ builtin/submodule--helper.c: static int run_update_procedure(int argc, const char **argv, const char *prefix) + + free(prefixed_path); -+ # Note that the submodule is a submodule. -+ git -C "$sm_path" config submodule.hasSuperproject "true" ++ /* ++ * This entry point is always called from a submodule, so this is a ++ * good place to set a hint that this repo is a submodule. ++ */ ++ git_config_set("submodule.hasSuperproject", "true"); + - if test -n "$recursive" - then - ( + if (!oideq(&update_data.oid, &update_data.suboid) || update_data.force) + return do_run_update_procedure(&update_data); + ## submodule.c ## @@ submodule.c: static void relocate_single_git_dir_into_superproject(const char *path) @@ submodule.c: static void relocate_single_git_dir_into_superproject(const char *p relocate_gitdir(path, real_old_git_dir, real_new_git_dir); -+ /* -+ * Note location of superproject's gitdir. Because the submodule already -+ * has a gitdir and local config, we can store this pointer from -+ * worktree config to worktree config, if the submodule has -+ * extensions.worktreeConfig set. -+ */ + strbuf_addf(&config_path, "%s/config", real_new_git_dir); + git_configset_init(&sub_cs); + git_configset_add_file(&sub_cs, config_path.buf); @@ t/t7400-submodule-basic.sh: inspect() { git -C "$sub_dir" diff-files --exit-code && + + # Ensure that submodule.hasSuperproject is set. -+ git -C "$sub_dir" config "submodule.hasSuperproject" ++ test_cmp_config -C "$sub_dir" true --type=bool "submodule.hasSuperproject" + git -C "$sub_dir" clean -n -d -x >untracked } @@ t/t7406-submodule-update.sh: test_expect_success 'submodule update --quiet passe +test_expect_success 'submodule update adds submodule.hasSuperproject to older repos' ' + (cd super && -+ git -C submodule config --unset submodule.hasSuperproject && ++ test_unconfig submodule.hasSuperproject && + git submodule update && -+ git -C submodule config submodule.hasSuperproject ++ test_cmp_config -C submodule true --type=bool submodule.hasSuperproject + ) +' + @@ t/t7412-submodule-absorbgitdirs.sh: test_expect_success 'absorb the git dir' ' - test_cmp expect.2 actual.2 + test_cmp expect.2 actual.2 && + -+ git -C sub1 config submodule.hasSuperproject ++ test_cmp_config -C sub1 true --type=bool submodule.hasSuperproject ' test_expect_success 'absorbing does not fail for deinitialized submodules' ' @@ 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 && + -+ git -C sub1/nested config submodule.hasSuperproject ++ test_cmp_config -C sub1/nested true --type=bool submodule.hasSuperproject ' test_expect_success 're-setup nested submodule' ' @@ t/t7412-submodule-absorbgitdirs.sh: test_expect_success 'absorbing fails for a s + git submodule absorbgitdirs sub4 && + + # make sure the submodule noted the superproject -+ git -C sub4 config submodule.hasSuperproject ++ test_cmp_config -C sub4 true --type=bool submodule.hasSuperproject + ) +' + @@ t/t7412-submodule-absorbgitdirs.sh: test_expect_success 'absorbing fails for a s + git submodule absorbgitdirs sub5 && + + # make sure the submodule noted the superproject -+ git -C sub5 config submodule.hasSuperproject ++ test_cmp_config -C sub5 true --type=bool submodule.hasSuperproject + ) +' + 2: c14ee8760f < -: ---------- rev-parse: short-circuit superproject worktree when config unset -: ---------- > 3: 1893a84fdc rev-parse: short-circuit superproject worktree when config unset -- 2.35.1.616.g0bdcbb4464-goog
