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

Re: [PATCH v2 0/5] re-parenting relative directories after chdir

From
Duy Nguyen <pclouds@gmail.com>
Date
Mar 30, 2018, 19:36 UTC
Message-ID
<20180330193637.GA1620@duynguyen.home>
In-Reply-To
<20180330183425.GA30575@sigill.intra.peff.net>
On Fri, Mar 30, 2018 at 02:34:25PM -0400, Jeff King wrote:
Show 25 quoted lines
> On Wed, Mar 28, 2018 at 01:36:56PM -0400, Jeff King wrote:
> 
> > For those just joining us, this fixes a regression that was in v2.13 (so
> > nothing we need to worry about as part of the 2.17-rc track).
> > 
> >   [1/4]: set_git_dir: die when setenv() fails
> >   [2/4]: add chdir-notify API
> >   [3/4]: set_work_tree: use chdir_notify
> >   [4/4]: refs: use chdir_notify to update cached relative paths
> 
> Here's a re-roll based on the feedback I got, including:
> 
>  - fixes the memory leak and vague comment pointed out by Eric
> 
>  - adds in tracing code from Duy
> 
>  - I took Duy's suggestions regarding "least" surprise in some of the
>    functions (reparenting NULL is a noop, and registering a reparent
>    handler does so even for an absolute path).
> 
> I punted on the "registering the same path twice" thing. That is a
> potential way to misuse this API, but I don't think there's a good
> solution. The "reparent" helper could figure this out for you, but in
> the general case we actually install an arbitrary callback. So the
> caller really has to handle it there.
The series looks good to me.
> 
> I think in the long run we'd want to outlaw calling set_git_dir() twice
> anyway.

Oh yeah. With my latest WIP changes, the bottom of setup_git_directory_gently() looks like this. Nowhere else in setup code calls these functions anymore (except the current setup_work_tree)

-- 8< --
	if (result.worktree)
		set_git_work_tree(result.worktree);
	if (result.gitdir)
		set_git_dir(result.gitdir);
	if (startup_info->have_repository)
		repo_set_hash_algo(the_repository, result.repo_fmt.hash_algo);
	...
	return result.prefix;
-- 8< --

From here on, it's not hard to see how to turn set_git_work_tree() into setup_work_tree_gently() (without doing any set_git_dir) and the last two calls into "repo_init_gitdir(gitdir, hash_algo)", which should be where we allocate a new repository object and initialize related object store, ref store...

But I still have a couple setup corner cases to deal with first :( -- Duy

Previous: Jeff KingNext: Jeff King
Message 36 of 54 in “git complains packed-refs is not a directory when used with GIT_DIR and GIT_WORK_TREE envvars.”
  1. Rafael AscensaoMar 26, 2018
  2. Ævar Arnfjörð BjarmasonMar 26, 2018
  3. Jeff KingMar 27, 2018
  4. Duy NguyenMar 27, 2018
  5. Jeff KingMar 27, 2018
  6. Duy NguyenMar 27, 2018
  7. Duy NguyenMar 27, 2018
  8. Jeff KingMar 28, 2018
  9. Duy NguyenMar 28, 2018
  10. Jeff KingMar 28, 2018
  11. 1/4 set_git_dir: die when setenv() failsJeff King, Mar 28, 2018
  12. 2/4 add chdir-notify APIJeff King, Mar 28, 2018
  13. Eric SunshineMar 28, 2018
  14. Jeff KingMar 28, 2018
  15. Duy NguyenMar 29, 2018
  16. Jeff KingMar 29, 2018
  17. Duy NguyenMar 29, 2018
  18. 3/4 set_work_tree: use chdir_notifyJeff King, Mar 28, 2018
  19. Duy NguyenMar 29, 2018
  20. Duy NguyenMar 29, 2018
  21. Jeff KingMar 29, 2018
  22. Jeff KingMar 29, 2018
  23. Duy NguyenMar 29, 2018
  24. Jeff KingMar 30, 2018
  25. 4/4 refs: use chdir_notify to update cached relative pathsJeff King, Mar 28, 2018
  26. 0/5 re-parenting relative directories after chdirJeff King, Mar 30, 2018
  27. 1/5 set_git_dir: die when setenv() failsJeff King, Mar 30, 2018
  28. 2/5 trace.c: export trace_setup_keyJeff King, Mar 30, 2018
  29. Junio C HamanoMar 30, 2018
  30. Jeff KingMar 30, 2018
  31. Junio C HamanoMar 30, 2018
  32. Jeff KingMar 30, 2018
  33. 3/5 add chdir-notify APIJeff King, Mar 30, 2018
  34. 4/5 set_work_tree: use chdir_notifyJeff King, Mar 30, 2018
  35. 5/5 refs: use chdir_notify to update cached relative pathsJeff King, Mar 30, 2018
  36. Duy NguyenMar 30, 2018
  37. Jeff KingMar 28, 2018
  38. 0/8 Re: git complains packed-refs is not a directory when used with GIT_DIR and GIT_WORK_TREE envvars.Nguyễn Thái Ngọc Duy, Mar 28, 2018
  39. 1/8 strbuf.c: add strbuf_ensure_trailing_dr_sep()Nguyễn Thái Ngọc Duy, Mar 28, 2018
  40. 2/8 strbuf.c: reintroduce get_pwd_cwd() (with strbuf_ prefix)Nguyễn Thái Ngọc Duy, Mar 28, 2018
  41. Stefan BellerMar 28, 2018
  42. Duy NguyenMar 28, 2018
  43. 3/8 trace.c: export trace_setup_keyNguyễn Thái Ngọc Duy, Mar 28, 2018
  44. 4/8 setup.c: introduce setup_adjust_path()Nguyễn Thái Ngọc Duy, Mar 28, 2018
  45. 5/8 setup.c: allow other code to be notified when $CWD movesNguyễn Thái Ngọc Duy, Mar 28, 2018
  46. 6/8 environment.c: adjust env containing relpath when $CWD is movedNguyễn Thái Ngọc Duy, Mar 28, 2018
  47. Jeff KingMar 28, 2018
  48. Duy NguyenMar 28, 2018
  49. 8/8 refs: adjust main repo paths when $CWD movesNguyễn Thái Ngọc Duy, Mar 28, 2018
  50. 7/8 repository: adjust repo paths when $CWD movesNguyễn Thái Ngọc Duy, Mar 28, 2018
  51. Jeff KingMar 28, 2018
  52. Duy NguyenMar 29, 2018
  53. Jeff KingMar 30, 2018
  54. Junio C HamanoMar 28, 2018

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.