git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [GSoC Patch v7 2/8] submodule: use repository to find superproject

From
Justin Tobler <jltobler@gmail.com>
Date
Nov 2, 2026, 21:36 UTC
Message-ID
<auj3hhrRvyX9lus6@denethor>
In-Reply-To
<20260927114420.59724-3-jayatheerthkulkarni2005@gmail.com>
On 26/09/27 05:14PM, K Jayatheerth wrote:
Show 7 quoted lines
> `get_superproject_working_tree()` currently uses `xgetcwd()` to
> determine the repository whose superproject should be checked.
> 
> This is incorrect when `--git-dir` points to a repository different
> from the one associated with the current working directory. In that
> case, the current working directory may cause the function to return
> the wrong superproject or an empty result.

Ok, so we are not taking into account here that the git dir location could be different than the current working directory.

> Pass the `repository` to `get_superproject_working_tree()` so that the
> superproject is determined from the repository being inspected rather
> than the current working directory.
Makes sense.
Show 52 quoted lines
> Mentored-by: Justin Tobler <jltobler@gmail.com>
> Mentored-by: Lucas Seiki Oshiro <lucasseikioshiro@gmail.com>
> Signed-off-by: K Jayatheerth <jayatheerthkulkarni2005@gmail.com>
> ---
>  builtin/rev-parse.c        |  2 +-
>  submodule.c                | 43 +++++++++++++++++++-------------------
>  submodule.h                |  2 +-
>  t/t7400-submodule-basic.sh | 19 +++++++++++++++++
>  4 files changed, 43 insertions(+), 23 deletions(-)
> 
> diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
> index 43693454d5..e1a6da0076 100644
> --- a/builtin/rev-parse.c
> +++ b/builtin/rev-parse.c
> @@ -997,7 +997,7 @@ int cmd_rev_parse(int argc,
>  			}
>  			if (!strcmp(arg, "--show-superproject-working-tree")) {
>  				struct strbuf superproject = STRBUF_INIT;
> -				if (get_superproject_working_tree(&superproject))
> +				if (get_superproject_working_tree(the_repository, &superproject))
>  					print_path(superproject.buf, prefix, format, DEFAULT_UNMODIFIED);
>  				strbuf_release(&superproject);
>  				continue;
> diff --git a/submodule.c b/submodule.c
> index 6fcb606f7e..4db90ef9b0 100644
> --- a/submodule.c
> +++ b/submodule.c
> @@ -2610,34 +2610,35 @@ void absorb_git_dir_into_superproject(const char *path,
>  	absorb_git_dir_into_superproject_recurse(path, super_prefix);
>  }
>  
> -int get_superproject_working_tree(struct strbuf *buf)
> +int get_superproject_working_tree(struct repository *r, struct strbuf *buf)
>  {
>  	struct child_process cp = CHILD_PROCESS_INIT;
>  	struct strbuf sb = STRBUF_INIT;
>  	struct strbuf one_up = STRBUF_INIT;
> -	char *cwd = xgetcwd();
> +	struct strbuf target_wt = STRBUF_INIT;
> +	const char *worktree;
>  	int ret = 0;
>  	const char *subpath;
>  	int code;
>  	ssize_t len;
>  
> -	if (!is_inside_work_tree(the_repository))
> -		/*
> -		 * FIXME:
> -		 * We might have a superproject, but it is harder
> -		 * to determine.
> -		 */
> +	worktree = repo_get_work_tree(r);

We now use the passed repository to get the working tree instead of relying getting the current working directory and checking if we are inside a worktree. Looks good.

Show 9 quoted lines
> +	if (!worktree)
> +		goto out;
> +
> +	if (!strbuf_realpath(&target_wt, worktree, 0))
>  		goto out;
>  
> -	if (!strbuf_realpath(&one_up, "../", 0))
> +	strbuf_addf(&one_up, "%s/..", target_wt.buf);
> +	if (!strbuf_realpath(&one_up, one_up.buf, 0))

I was confused at first why we bother invoking `strbuf_realpath()` here since it's just an intermediate step, but I assume that is so we can use it in the error statement later on.

Show 30 quoted lines
>  		goto out;
>  
> -	subpath = relative_path(cwd, one_up.buf, &sb);
> +	subpath = relative_path(target_wt.buf, one_up.buf, &sb);
>  
>  	prepare_submodule_repo_env(&cp.env);
>  	strvec_pop(&cp.env);
>  
> -	strvec_pushl(&cp.args, "--literal-pathspecs", "-C", "..",
> +	strvec_pushl(&cp.args, "--literal-pathspecs", "-C", one_up.buf,
>  		     "ls-files", "-z", "--stage", "--full-name", "--",
>  		     subpath, NULL);
>  	strbuf_reset(&sb);
> @@ -2648,14 +2649,14 @@ int get_superproject_working_tree(struct strbuf *buf)
>  	cp.git_cmd = 1;
>  
>  	if (start_command(&cp))
> -		die(_("could not start ls-files in .."));
> +		die(_("could not start ls-files in %s"), one_up.buf);
>  
>  	len = strbuf_read(&sb, cp.out, PATH_MAX);
>  	close(cp.out);
>  
>  	if (starts_with(sb.buf, "160000")) {
>  		int super_sub_len;
> -		int cwd_len = strlen(cwd);
> +		int wt_len = target_wt.len;
>  		char *super_sub, *super_wt;
>  
>  		/*
[snip]
Show 15 quoted lines
> +test_expect_success 'path.superproject-root works with --git-dir' '
> +	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" &&
> +
> +		SUPER_ROOT="$(test-tool path-utils real_path .)" &&
> +		MODULE_DIR="$SUPER_ROOT/.git/modules/sub" &&
> +
> +		echo "path.superproject-root.absolute=$SUPER_ROOT" >expect &&
> +		git --git-dir="$MODULE_DIR" repo info path.superproject-root.absolute >actual &&

`path.superproject-root` isn't introduced until the next patch, so this test fails at this commit. Maybe the test should exercise the existing `git --git-dir=... rev-parse --show-superproject-working-tree` caller in t1500 instead?

-Justin
Previous: K JayatheerthNext: K Jayatheerth
Message 89 of 135 in “repo: add more path keys to git repo info”
  1. 0/7 repo: add more path keys to git repo infoK Jayatheerth, Jul 16, 2026
  2. 1/7 repo: add path.toplevel with absolute and relative suffix formattingK Jayatheerth, Jul 16, 2026
  3. Lucas Seiki OshiroAug 15, 2026
  4. K JayatheerthAug 18, 2026
  5. 2/7 repo: add path.superproject-working-tree with absolute and relative suffixesK Jayatheerth, Jul 16, 2026
  6. 3/7 repo: add path.objects with absolute and relative suffix formattingK Jayatheerth, Jul 16, 2026
  7. 4/7 repo: add path.hooks with absolute and relative suffix formattingK Jayatheerth, Jul 16, 2026
  8. 5/7 repo: add path.index with absolute and relative suffix formattingK Jayatheerth, Jul 16, 2026
  9. 6/7 repo: add path.grafts with absolute and relative suffix formattingK Jayatheerth, Jul 16, 2026
  10. 7/7 repo: add path.git-prefix path key validationK Jayatheerth, Jul 16, 2026
  11. Junio C HamanoJul 16, 2026
  12. K JayatheerthJul 16, 2026
  13. 0/7 repo: add more path keys to git repo infoK Jayatheerth, Jul 17, 2026
  14. 1/7 repo: add path.toplevel with absolute and relative suffix formattingK Jayatheerth, Jul 17, 2026
  15. 2/7 repo: add path.superproject-working-tree with absolute and relative suffixesK Jayatheerth, Jul 17, 2026
  16. 3/7 repo: add path.objects with absolute and relative suffix formattingK Jayatheerth, Jul 17, 2026
  17. 4/7 repo: add path.hooks with absolute and relative suffix formattingK Jayatheerth, Jul 17, 2026
  18. 5/7 repo: add path.index with absolute and relative suffix formattingK Jayatheerth, Jul 17, 2026
  19. Lucas Seiki OshiroJul 20, 2026
  20. K JayatheerthJul 24, 2026
  21. Junio C HamanoJul 24, 2026
  22. 6/7 repo: add path.grafts with absolute and relative suffix formattingK Jayatheerth, Jul 17, 2026
  23. Lucas Seiki OshiroJul 20, 2026
  24. Junio C HamanoJul 20, 2026
  25. K JayatheerthJul 21, 2026
  26. 7/7 repo: add path.git-prefix path keyK Jayatheerth, Jul 17, 2026
  27. 0/7 repo: add more path keys to git repo infoK Jayatheerth, Jul 26, 2026
  28. 1/7 repo: add path.toplevel with absolute and relative suffix formattingK Jayatheerth, Jul 26, 2026
  29. Junio C HamanoJul 27, 2026
  30. K JayatheerthJul 28, 2026
  31. Justin ToblerJul 28, 2026
  32. K JayatheerthJul 29, 2026
  33. 2/7 repo: add path.superproject-working-tree with absolute and relative suffixesK Jayatheerth, Jul 26, 2026
  34. Justin ToblerJul 28, 2026
  35. 3/7 repo: add path.objects with absolute and relative suffix formattingK Jayatheerth, Jul 26, 2026
  36. Justin ToblerJul 28, 2026
  37. 4/7 repo: add path.hooks with absolute and relative suffix formattingK Jayatheerth, Jul 26, 2026
  38. Justin ToblerJul 28, 2026
  39. 5/7 repo: add path.index with absolute and relative suffix formattingK Jayatheerth, Jul 26, 2026
  40. 6/7 repo: add path.grafts with absolute and relative suffix formattingK Jayatheerth, Jul 26, 2026
  41. 7/7 repo: add path.git-prefix path keyK Jayatheerth, Jul 26, 2026
  42. Junio C HamanoJul 26, 2026
  43. K JayatheerthJul 26, 2026
  44. Lucas Seiki OshiroJul 27, 2026
  45. Junio C HamanoJul 27, 2026
  46. 0/7 repo: add more path keys to git repo infoK Jayatheerth, Aug 6, 2026
  47. 1/7 repo: add path.toplevel with absolute and relative suffix formattingK Jayatheerth, Aug 6, 2026
  48. 2/7 repo: add path.superproject-root with absolute and relative suffixesK Jayatheerth, Aug 6, 2026
  49. 3/7 repo: add path.hooks with absolute and relative suffixesK Jayatheerth, Aug 6, 2026
  50. 4/7 repo: add path.index with absolute and relative suffixesK Jayatheerth, Aug 6, 2026
  51. 5/7 repo: add path.grafts with absolute and relative suffixesK Jayatheerth, Aug 6, 2026
  52. 6/7 repo: add path.git-prefixK Jayatheerth, Aug 6, 2026
  53. Lucas Seiki OshiroAug 16, 2026
  54. K JayatheerthAug 18, 2026
  55. Junio C HamanoAug 18, 2026
  56. K JayatheerthAug 21, 2026
  57. 7/7 repo: remove unused setup.h includeK Jayatheerth, Aug 6, 2026
  58. 0/7 add more path keys to git repo infoK Jayatheerth, Aug 25, 2026
  59. 1/7 repo: add path.toplevel with absolute and relative suffix formattingK Jayatheerth, Aug 25, 2026
  60. 2/7 repo: add path.superproject-root with absolute and relative suffixesK Jayatheerth, Aug 25, 2026
  61. Junio C HamanoSep 4, 2026
  62. K JayatheerthSep 5, 2026
  63. 3/7 repo: add path.hooks with absolute and relative suffixesK Jayatheerth, Aug 25, 2026
  64. 4/7 repo: add path.index with absolute and relative suffixesK Jayatheerth, Aug 25, 2026
  65. 5/7 repo: add path.grafts with absolute and relative suffixesK Jayatheerth, Aug 25, 2026
  66. 6/7 repo: add path.git-prefixK Jayatheerth, Aug 25, 2026
  67. 7/7 repo: add path.cdupK Jayatheerth, Aug 25, 2026
  68. Junio C HamanoAug 25, 2026
  69. K JayatheerthSep 4, 2026
  70. SZEDER GáborAug 26, 2026
  71. Junio C HamanoAug 26, 2026
  72. 0/7 add more path keys to git repo infoK Jayatheerth, Sep 11, 2026
  73. 1/7 repo: add path.toplevel with absolute and relative suffix formattingK Jayatheerth, Sep 11, 2026
  74. 2/7 repo: add path.superproject-root with absolute and relative suffixesK Jayatheerth, Sep 11, 2026
  75. Junio C HamanoSep 11, 2026
  76. K JayatheerthSep 23, 2026
  77. 3/7 repo: add path.hooks with absolute and relative suffixesK Jayatheerth, Sep 11, 2026
  78. 4/7 repo: add path.index with absolute and relative suffixesK Jayatheerth, Sep 11, 2026
  79. Junio C HamanoSep 11, 2026
  80. K JayatheerthSep 23, 2026
  81. 5/7 repo: add path.grafts with absolute and relative suffixesK Jayatheerth, Sep 11, 2026
  82. 6/7 repo: add path.git-prefixK Jayatheerth, Sep 11, 2026
  83. 7/7 repo: add path.cdupK Jayatheerth, Sep 11, 2026
  84. Junio C HamanoSep 11, 2026
  85. K JayatheerthSep 23, 2026
  86. 0/8 add more path keys to git repo infoK Jayatheerth, Sep 27, 2026
  87. 1/8 repo: add path.toplevel with absolute and relative suffix formattingK Jayatheerth, Sep 27, 2026
  88. 2/8 submodule: use repository to find superprojectK Jayatheerth, Sep 27, 2026
  89. Justin ToblerNov 2, 2026
  90. K JayatheerthNov 3, 2026
  91. 3/8 repo: add path.superproject-root with absolute and relative suffixesK Jayatheerth, Sep 27, 2026
  92. Justin ToblerNov 2, 2026
  93. K JayatheerthNov 3, 2026
  94. 4/8 repo: add path.hooks with absolute and relative suffixesK Jayatheerth, Sep 27, 2026
  95. Justin ToblerNov 2, 2026
  96. K JayatheerthNov 3, 2026
  97. Justin ToblerNov 3, 2026
  98. K JayatheerthNov 3, 2026
  99. 5/8 repo: add path.index with absolute and relative suffixesK Jayatheerth, Sep 27, 2026
  100. 6/8 repo: add path.grafts with absolute and relative suffixesK Jayatheerth, Sep 27, 2026
  101. Justin ToblerNov 2, 2026
  102. K JayatheerthNov 3, 2026
  103. 7/8 repo: add path.git-prefixK Jayatheerth, Sep 27, 2026
  104. 8/8 repo: add path.cdupK Jayatheerth, Sep 27, 2026
  105. Justin ToblerNov 2, 2026
  106. K JayatheerthNov 3, 2026
  107. Junio C HamanoNov 1, 2026
  108. Justin ToblerNov 1, 2026
  109. Junio C HamanoNov 2, 2026
  110. 0/7 repo: add path keys to repo infoK Jayatheerth, Nov 7, 2026
  111. 1/7 repo: add path.toplevel with absolute and relative suffix formattingK Jayatheerth, Nov 7, 2026
  112. 2/7 submodule: use repository to find superprojectK Jayatheerth, Nov 7, 2026
  113. 3/7 repo: add path.superproject-root with absolute and relative suffixesK Jayatheerth, Nov 7, 2026
  114. 4/7 repo: add path.hooks with absolute and relative suffixesK Jayatheerth, Nov 7, 2026
  115. 5/7 repo: add path.index with absolute and relative suffixesK Jayatheerth, Nov 7, 2026
  116. 6/7 repo: add path.git-prefixK Jayatheerth, Nov 7, 2026
  117. 7/7 repo: add path.cdupK Jayatheerth, Nov 7, 2026
  118. Phillip WoodNov 7, 2026
  119. K JayatheerthNov 9, 2026
  120. Junio C HamanoNov 9, 2026
  121. Phillip WoodNov 10, 2026
  122. K JayatheerthNov 11, 2026
  123. Phillip WoodNov 10, 2026
  124. K JayatheerthNov 11, 2026
  125. Phillip WoodNov 11, 2026
  126. 0/5 repo: add path keys to repo infoK Jayatheerth, Nov 14, 2026
  127. 1/5 repo: add path.workingtree with absolute and relative suffix formattingK Jayatheerth, Nov 14, 2026
  128. 2/5 submodule: use repository to find superprojectK Jayatheerth, Nov 14, 2026
  129. 3/5 repo: add path.superprojectworkingtree with absolute and relative suffixesK Jayatheerth, Nov 14, 2026
  130. 4/5 repo: add path.index with absolute and relative suffixesK Jayatheerth, Nov 14, 2026
  131. 5/5 repo: add path.prefixK Jayatheerth, Nov 14, 2026
  132. Phillip WoodNov 15, 2026
  133. K JayatheerthNov 15, 2026
  134. Phillip WoodNov 15, 2026
  135. K JayatheerthNov 16, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.