From: K Jayatheerth Date: Sat, 14 Nov 2026 16:37:13 GMT Subject: [GSoC Patch v9 3/5] repo: add path.superprojectworkingtree with absolute and relative suffixes Message-ID: <20261114163715.257705-4-jayatheerthkulkarni2005@gmail.com> In-Reply-To: <20261114163715.257705-1-jayatheerthkulkarni2005@gmail.com> Scripts working in multi-repository setups often need to identify the top-level working tree of a superproject from within a submodule. Currently, this is only exposed via `git rev-parse --show-superproject-working-tree`. Introduce `path.superprojectworkingtree.absolute` and `path.superprojectworkingtree.relative` keys to `git repo info`. This exposes the core submodule context via a scriptable config-like key using standard format rules. If requested when not inside a submodule, the command returns an empty string. Mentored-by: Justin Tobler Mentored-by: Lucas Seiki Oshiro Signed-off-by: K Jayatheerth --- Documentation/git-repo.adoc | 10 ++++++++++ builtin/repo.c | 25 ++++++++++++++++++++++++ t/t1900-repo-info.sh | 39 +++++++++++++++++++++++++++++++++++++ 3 files changed, 74 insertions(+) diff --git a/Documentation/git-repo.adoc b/Documentation/git-repo.adoc index 82bcd8ad2e..8cb154513a 100644 --- a/Documentation/git-repo.adoc +++ b/Documentation/git-repo.adoc @@ -119,6 +119,16 @@ values that they return: `path.gitdir.relative`:: The path to the Git repository directory relative to the current working directory. +`path.superprojectworkingtree.absolute`:: + The canonical absolute path to the working tree root of the superproject + if the current repository is an initialized submodule. Outputs an empty + string if not in a submodule. + +`path.superprojectworkingtree.relative`:: + The path to the working tree root of the superproject relative to the + current working directory if the current repository is an initialized + submodule. Outputs an empty string if not in a submodule. + `path.workingtree.absolute`:: The canonical absolute path to the top-level directory of the repository's working tree. Outputs an empty string if the repository diff --git a/builtin/repo.c b/builtin/repo.c index 9ec8623a8e..8b461ea226 100644 --- a/builtin/repo.c +++ b/builtin/repo.c @@ -18,6 +18,7 @@ #include "strbuf.h" #include "string-list.h" #include "shallow.h" +#include "submodule.h" #include "tree.h" #include "tree-walk.h" #include "utf8.h" @@ -121,6 +122,28 @@ static int get_path_gitdir_relative(struct repository *repo, struct strbuf *buf) return 0; } +static int get_path_superprojectworkingtree_absolute(struct repository *repo, struct strbuf *buf) +{ + struct strbuf superproject = STRBUF_INIT; + + if (get_superproject_working_tree(repo, &superproject)) + format_path(buf, superproject.buf, "", PATH_FORMAT_CANONICAL); + + strbuf_release(&superproject); + return 0; +} + +static int get_path_superprojectworkingtree_relative(struct repository *repo, struct strbuf *buf) +{ + struct strbuf superproject = STRBUF_INIT; + + if (get_superproject_working_tree(repo, &superproject)) + format_path(buf, superproject.buf, repo->prefix, PATH_FORMAT_RELATIVE); + + strbuf_release(&superproject); + return 0; +} + static int get_path_workingtree_absolute(struct repository *repo, struct strbuf *buf) { const char *work_tree = repo_get_work_tree(repo); @@ -159,6 +182,8 @@ static const struct repo_info_field repo_info_field[] = { { "path.commondir.relative", get_path_commondir_relative }, { "path.gitdir.absolute", get_path_gitdir_absolute }, { "path.gitdir.relative", get_path_gitdir_relative }, + { "path.superprojectworkingtree.absolute", get_path_superprojectworkingtree_absolute }, + { "path.superprojectworkingtree.relative", get_path_superprojectworkingtree_relative }, { "path.workingtree.absolute", get_path_workingtree_absolute }, { "path.workingtree.relative", get_path_workingtree_relative }, { "references.format", get_references_format }, diff --git a/t/t1900-repo-info.sh b/t/t1900-repo-info.sh index 3225fc8583..582f643dd1 100755 --- a/t/t1900-repo-info.sh +++ b/t/t1900-repo-info.sh @@ -213,6 +213,45 @@ test_repo_info_path 'gitdir with explicit GIT_DIR' 'gitdir' \ '.git' \ 'GIT_DIR="../.git" && export GIT_DIR' +test_expect_success 'path.superprojectworkingtree absolute and relative' ' + test_when_finished "rm -rf sub super" && + git init sub && + test_commit -C sub initial && + git init super && + ( + cd super && + git -c protocol.file.allow=always submodule add "../sub" sub && + git commit -m "add submodule" && + + cd sub && + ROOT="$(test-tool path-utils real_path ..)" && + + echo "path.superprojectworkingtree.absolute=$ROOT" >expect.abs && + git repo info path.superprojectworkingtree.absolute >actual.abs && + test_cmp expect.abs actual.abs && + + echo "path.superprojectworkingtree.relative=../" >expect.rel && + git repo info path.superprojectworkingtree.relative >actual.rel && + test_cmp expect.rel actual.rel + ) +' + +test_expect_success 'path.superprojectworkingtree returns empty when not in a submodule' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + + echo "path.superprojectworkingtree.absolute=" >expect.abs && + git repo info path.superprojectworkingtree.absolute >actual.abs && + test_cmp expect.abs actual.abs && + + echo "path.superprojectworkingtree.relative=" >expect.rel && + git repo info path.superprojectworkingtree.relative >actual.rel && + test_cmp expect.rel actual.rel + ) +' + test_expect_success 'path.workingtree absolute and relative' ' test_when_finished "rm -rf repo" && git init repo && -- 2.56.0-rc2