| Message ID | 3cf6ceb274d20ce76d0be65e4362a33579627052.1703754513.git.ps@pks.im (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 2eb1d0c45271faf149a13b61bb74af52abd7b3aa |
| Headers | show |
| Series | [1/6] refs: prepare `refs_init_db()` for initializing worktree refs | expand |
On Fri, Dec 29, 2023 at 5:16 AM Patrick Steinhardt <ps@pks.im> wrote: > The files ref backend will create both "refs/heads" and "refs/tags" in > the Git directory. While this logic makes sense for normal repositories, > it does not fo worktrees because those refs are "common" refs that would > always be contained in the main repository's ref database. s/fo/for/ (not worth a reroll) > Introduce a new flag telling the backend that it is expected to create a > per-worktree ref database and skip creation of these dirs in the files > backend when the flag is set. No other backends (currently) need > worktree-specific logic, so this is the only required change to start > creating per-worktree ref databases via `refs_init_db()`. > > Signed-off-by: Patrick Steinhardt <ps@pks.im>
diff --git a/refs.h b/refs.h index 6090e92578..8ed890841b 100644 --- a/refs.h +++ b/refs.h @@ -123,6 +123,8 @@ int should_autocreate_reflog(const char *refname); int is_branch(const char *refname); +#define REFS_INIT_DB_IS_WORKTREE (1 << 0) + int refs_init_db(struct ref_store *refs, int flags, struct strbuf *err); /* diff --git a/refs/files-backend.c b/refs/files-backend.c index ed47c5dc08..a82d6c453f 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -3221,7 +3221,7 @@ static int files_reflog_expire(struct ref_store *ref_store, } static int files_init_db(struct ref_store *ref_store, - int flags UNUSED, + int flags, struct strbuf *err UNUSED) { struct files_ref_store *refs = @@ -3245,15 +3245,21 @@ static int files_init_db(struct ref_store *ref_store, adjust_shared_perm(sb.buf); /* - * Create .git/refs/{heads,tags} + * There is no need to create directories for common refs when creating + * a worktree ref store. */ - strbuf_reset(&sb); - files_ref_path(refs, &sb, "refs/heads"); - safe_create_dir(sb.buf, 1); + if (!(flags & REFS_INIT_DB_IS_WORKTREE)) { + /* + * Create .git/refs/{heads,tags} + */ + strbuf_reset(&sb); + files_ref_path(refs, &sb, "refs/heads"); + safe_create_dir(sb.buf, 1); - strbuf_reset(&sb); - files_ref_path(refs, &sb, "refs/tags"); - safe_create_dir(sb.buf, 1); + strbuf_reset(&sb); + files_ref_path(refs, &sb, "refs/tags"); + safe_create_dir(sb.buf, 1); + } strbuf_release(&sb); return 0;
The files ref backend will create both "refs/heads" and "refs/tags" in the Git directory. While this logic makes sense for normal repositories, it does not fo worktrees because those refs are "common" refs that would always be contained in the main repository's ref database. Introduce a new flag telling the backend that it is expected to create a per-worktree ref database and skip creation of these dirs in the files backend when the flag is set. No other backends (currently) need worktree-specific logic, so this is the only required change to start creating per-worktree ref databases via `refs_init_db()`. Signed-off-by: Patrick Steinhardt <ps@pks.im> --- refs.h | 2 ++ refs/files-backend.c | 22 ++++++++++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-)