Re: [PATCH 9/9] refs: always use absolute paths for reference stores
- From
Karthik Nayak <karthik.188@gmail.com>
- Date
- Jun 12, 2026, 09:58 UTC
- Message-ID
- <CAOLa=ZR60bhH4z9ZoKTCn97QzautcihxPbTZ=_e0raMTjzajZQ@mail.gmail.com>
- In-Reply-To
- <20260610-b4-pks-refs-avoid-chdir-notify-reparent-v1-9-56c864b01c43@pks.im>
Patrick Steinhardt <ps@pks.im> writes:
Show 9 quoted lines
> Both the "files" and "reftable" backends use > `refs_compute_filesystem_location()` to figure out the location of both > the git and common directories. Depending on how the function is called > we may or may not return an absolute path. > > There isn't really a good reason to use relative paths though. Quite on > the contrary, because we sometimes use relative paths we are forced to > register for chdir(3p) notifications via `chdir_notify_reparent()`. >
With the previous changes added, we register via `chdir_notify_register()`
Show 9 quoted lines
> Adapt the function to always return absolute paths. This results in a > user-visible change in behaviour where we now unconditionally print > absolute paths in error messages. But arguably, that change in behaviour > is acceptable and may even be good in cases where a Git command may end > up accessing references across multiple different repositories. > > Furthermore, drop the calls to `chdir_notify_reparent()`, which aren't > required anymore now that the paths are always absolute. >
Same here, should be `chdir_notify_register()`
Show 202 quoted lines
> Signed-off-by: Patrick Steinhardt <ps@pks.im>
> ---
> refs.c | 11 ++++++++---
> refs/files-backend.c | 22 ----------------------
> refs/packed-backend.c | 18 +-----------------
> refs/reftable-backend.c | 17 -----------------
> t/pack-refs-tests.sh | 6 +++---
> t/t0600-reffiles-backend.sh | 4 ++--
> t/t1423-ref-backend.sh | 9 ++++++---
> t/t5510-fetch.sh | 2 +-
> 8 files changed, 21 insertions(+), 68 deletions(-)
>
> diff --git a/refs.c b/refs.c
> index 4912510590..8679677bf7 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -3579,15 +3579,16 @@ void refs_compute_filesystem_location(const char *gitdir, const char *payload,
> * worktree path, as the 'gitdir' here is already the worktree
> * path and is different from 'commondir' denoted by 'ref_common_dir'.
> */
> + strbuf_reset(refdir);
> strbuf_addstr(refdir, gitdir);
> - return;
> + goto out;
> }
>
> if (!is_absolute_path(payload)) {
> strbuf_addf(ref_common_dir, "/%s", payload);
> - strbuf_realpath(ref_common_dir, ref_common_dir->buf, 1);
> } else {
> - strbuf_realpath(ref_common_dir, payload, 1);
> + strbuf_reset(ref_common_dir);
> + strbuf_addstr(ref_common_dir, payload);
> }
>
> strbuf_addbuf(refdir, ref_common_dir);
> @@ -3598,4 +3599,8 @@ void refs_compute_filesystem_location(const char *gitdir, const char *payload,
> BUG("worktree path does not contain slash");
> strbuf_addf(refdir, "/worktrees/%s", wt_id + 1);
> }
> +
> +out:
> + strbuf_realpath(ref_common_dir, ref_common_dir->buf, 1);
> + strbuf_realpath(refdir, refdir->buf, 1);
> }
> diff --git a/refs/files-backend.c b/refs/files-backend.c
> index 296981584b..762f392e67 100644
> --- a/refs/files-backend.c
> +++ b/refs/files-backend.c
> @@ -21,7 +21,6 @@
> #include "../lockfile.h"
> #include "../path.h"
> #include "../dir.h"
> -#include "../chdir-notify.h"
> #include "../setup.h"
> #include "../worktree.h"
> #include "../wrapper.h"
> @@ -100,23 +99,6 @@ static void clear_loose_ref_cache(struct files_ref_store *refs)
> }
> }
>
> -static void files_ref_store_reparent(const char *name UNUSED,
> - const char *old_cwd,
> - const char *new_cwd,
> - void *payload)
> -{
> - struct files_ref_store *refs = payload;
> - char *tmp;
> -
> - tmp = reparent_relative_path(old_cwd, new_cwd, refs->base.gitdir);
> - free(refs->base.gitdir);
> - refs->base.gitdir = tmp;
> -
> - tmp = reparent_relative_path(old_cwd, new_cwd, refs->gitcommondir);
> - free(refs->gitcommondir);
> - refs->gitcommondir = tmp;
> -}
> -
> /*
> * Create a new submodule ref cache and add it to the internal
> * set of caches.
> @@ -145,10 +127,7 @@ static struct ref_store *files_ref_store_init(struct repository *repo,
>
> repo_config_get_bool(repo, "core.prefersymlinkrefs", &refs->prefer_symlink_refs);
>
> - chdir_notify_register(NULL, files_ref_store_reparent, refs);
> -
> strbuf_release(&refdir);
> -
> return ref_store;
> }
>
> @@ -197,7 +176,6 @@ static void files_ref_store_release(struct ref_store *ref_store)
> free(refs->gitcommondir);
> ref_store_release(refs->packed_ref_store);
> free(refs->packed_ref_store);
> - chdir_notify_unregister(NULL, files_ref_store_reparent, refs);
> }
>
> static void files_reflog_path(struct files_ref_store *refs,
> diff --git a/refs/packed-backend.c b/refs/packed-backend.c
> index 499cb55dfa..89e41a35a3 100644
> --- a/refs/packed-backend.c
> +++ b/refs/packed-backend.c
> @@ -13,7 +13,6 @@
> #include "packed-backend.h"
> #include "../iterator.h"
> #include "../lockfile.h"
> -#include "../chdir-notify.h"
> #include "../statinfo.h"
> #include "../worktree.h"
> #include "../wrapper.h"
> @@ -211,19 +210,6 @@ static size_t snapshot_hexsz(const struct snapshot *snapshot)
> return snapshot->refs->base.repo->hash_algo->hexsz;
> }
>
> -static void packed_ref_store_reparent(const char *name UNUSED,
> - const char *old_cwd,
> - const char *new_cwd,
> - void *payload)
> -{
> - struct packed_ref_store *refs = payload;
> - char *tmp;
> -
> - tmp = reparent_relative_path(old_cwd, new_cwd, refs->path);
> - free(refs->path);
> - refs->path = tmp;
> -}
> -
> /*
> * Since packed-refs is only stored in the common dir, don't parse the
> * payload and rely on the files-backend to set 'gitdir' correctly.
> @@ -239,10 +225,9 @@ struct ref_store *packed_ref_store_init(struct repository *repo,
>
> base_ref_store_init(ref_store, repo, gitdir, &refs_be_packed);
> refs->store_flags = opts->access_flags;
> -
> strbuf_addf(&sb, "%s/packed-refs", gitdir);
> refs->path = strbuf_detach(&sb, NULL);
> - chdir_notify_register(NULL, packed_ref_store_reparent, refs);
> +
> return ref_store;
> }
>
> @@ -287,7 +272,6 @@ static void packed_ref_store_release(struct ref_store *ref_store)
> clear_snapshot(refs);
> rollback_lock_file(&refs->lock);
> delete_tempfile(&refs->tempfile);
> - chdir_notify_unregister(NULL, packed_ref_store_reparent, refs);
> free(refs->path);
> }
>
> diff --git a/refs/reftable-backend.c b/refs/reftable-backend.c
> index 8c93070677..8cc1dbbbdd 100644
> --- a/refs/reftable-backend.c
> +++ b/refs/reftable-backend.c
> @@ -2,7 +2,6 @@
>
> #include "../git-compat-util.h"
> #include "../abspath.h"
> -#include "../chdir-notify.h"
> #include "../config.h"
> #include "../dir.h"
> #include "../environment.h"
> @@ -365,19 +364,6 @@ static int reftable_be_config(const char *var, const char *value,
> return 0;
> }
>
> -static void reftable_be_reparent(const char *name UNUSED,
> - const char *old_cwd,
> - const char *new_cwd,
> - void *payload)
> -{
> - struct reftable_ref_store *refs = payload;
> - char *tmp;
> -
> - tmp = reparent_relative_path(old_cwd, new_cwd, refs->base.gitdir);
> - free(refs->base.gitdir);
> - refs->base.gitdir = tmp;
> -}
> -
> static struct ref_store *reftable_be_init(struct repository *repo,
> const char *payload,
> const char *gitdir,
> @@ -460,8 +446,6 @@ static struct ref_store *reftable_be_init(struct repository *repo,
> goto done;
> }
>
> - chdir_notify_register(NULL, reftable_be_reparent, refs);
> -
> done:
> assert(refs->err != REFTABLE_API_ERROR);
> strbuf_release(&ref_common_dir);
> @@ -487,7 +471,6 @@ static void reftable_be_release(struct ref_store *ref_store)
> free(be);
> }
> strmap_clear(&refs->worktree_backends, 0);
> - chdir_notify_unregister(NULL, reftable_be_reparent, refs);
> }
>
> static int reftable_be_create_on_disk(struct ref_store *ref_store,
>The changes look good to me.
[snip]