From: Patrick Steinhardt <ps@pks.im>
To: git@vger.kernel.org
Cc: Derrick Stolee <stolee@gmail.com>, Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v3 4/7] worktree: expose function to retrieve worktree names
Date: Fri, 02 May 2025 10:44:01 +0200 [thread overview]
Message-ID: <20250502-pks-maintenance-missing-tasks-v3-4-13e130d36640@pks.im> (raw)
In-Reply-To: <20250502-pks-maintenance-missing-tasks-v3-0-13e130d36640@pks.im>
Introduce a function that retrieves worktree names as present in
".git/worktrees". This function will be used in a subsequent commit.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
---
builtin/worktree.c | 25 ++++++++++++-------------
worktree.c | 30 ++++++++++++++++++++++++++++++
worktree.h | 8 ++++++++
3 files changed, 50 insertions(+), 13 deletions(-)
diff --git a/builtin/worktree.c b/builtin/worktree.c
index 87ccd47794c..9b00dbf1265 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -211,27 +211,24 @@ static void prune_dups(struct string_list *l)
static void prune_worktrees(void)
{
- struct strbuf reason = STRBUF_INIT;
struct strbuf main_path = STRBUF_INIT;
struct string_list kept = STRING_LIST_INIT_DUP;
- char *path;
- DIR *dir;
- struct dirent *d;
+ struct strvec worktrees = STRVEC_INIT;
+ struct strbuf reason = STRBUF_INIT;
- path = repo_git_path(the_repository, "worktrees");
- dir = opendir(path);
- free(path);
- if (!dir)
+ if (get_worktree_names(the_repository, &worktrees) < 0 ||
+ !worktrees.nr)
return;
- while ((d = readdir_skip_dot_and_dotdot(dir)) != NULL) {
+
+ for (size_t i = 0; i < worktrees.nr; i++) {
char *path;
+
strbuf_reset(&reason);
- if (should_prune_worktree(d->d_name, &reason, &path, expire))
- prune_worktree(d->d_name, reason.buf);
+ if (should_prune_worktree(worktrees.v[i], &reason, &path, expire))
+ prune_worktree(worktrees.v[i], reason.buf);
else if (path)
- string_list_append_nodup(&kept, path)->util = xstrdup(d->d_name);
+ string_list_append_nodup(&kept, path)->util = xstrdup(worktrees.v[i]);
}
- closedir(dir);
strbuf_add_absolute_path(&main_path, repo_get_common_dir(the_repository));
/* massage main worktree absolute path to match 'gitdir' content */
@@ -242,6 +239,8 @@ static void prune_worktrees(void)
if (!show_only)
delete_worktrees_dir_if_empty();
+
+ strvec_clear(&worktrees);
strbuf_release(&reason);
}
diff --git a/worktree.c b/worktree.c
index c34b9eb74e5..947b7a82209 100644
--- a/worktree.c
+++ b/worktree.c
@@ -988,6 +988,36 @@ int should_prune_worktree(const char *id, struct strbuf *reason, char **wtpath,
return rc;
}
+int get_worktree_names(struct repository *repo, struct strvec *out)
+{
+ char *worktrees_dir;
+ struct dirent *d;
+ DIR *dir;
+ int ret;
+
+ worktrees_dir = repo_git_path(repo, "worktrees");
+ dir = opendir(worktrees_dir);
+ if (!dir) {
+ if (errno == ENOENT) {
+ ret = 0;
+ goto out;
+ }
+
+ ret = -1;
+ goto out;
+ }
+
+ while ((d = readdir_skip_dot_and_dotdot(dir)) != NULL)
+ strvec_push(out, d->d_name);
+
+ ret = 0;
+out:
+ if (dir)
+ closedir(dir);
+ free(worktrees_dir);
+ return ret;
+}
+
static int move_config_setting(const char *key, const char *value,
const char *from_file, const char *to_file)
{
diff --git a/worktree.h b/worktree.h
index e4bcccdc0ae..59825c37881 100644
--- a/worktree.h
+++ b/worktree.h
@@ -38,6 +38,14 @@ struct worktree **get_worktrees(void);
*/
struct worktree **get_worktrees_without_reading_head(void);
+/*
+ * Retrieve all worktree names. Not all names may correspond to a fully
+ * functional worktree. Returns 0 on success, a negative error code on failure.
+ * Calling the function on a repository that doesn't have any worktrees is not
+ * considered an error.
+ */
+int get_worktree_names(struct repository *repo, struct strvec *out);
+
/*
* Returns 1 if linked worktrees exist, 0 otherwise.
*/
--
2.49.0.987.g0cc8ee98dc.dirty
next prev parent reply other threads:[~2025-05-02 8:44 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-25 7:29 [PATCH 0/7] builtin/maintenance: implement missing tasks compared to git-gc(1) Patrick Steinhardt
2025-04-25 7:29 ` [PATCH 1/7] builtin/gc: fix indentation of `cmd_gc()` parameters Patrick Steinhardt
2025-04-25 7:29 ` [PATCH 2/7] builtin/gc: remove global variables where it trivial to do Patrick Steinhardt
2025-04-25 7:29 ` [PATCH 3/7] builtin/gc: move pruning of worktrees into a separate function Patrick Steinhardt
2025-04-25 7:29 ` [PATCH 4/7] worktree: expose function to retrieve worktree names Patrick Steinhardt
2025-04-25 7:29 ` [PATCH 5/7] builtin/maintenance: introduce "worktree-prune" task Patrick Steinhardt
2025-04-29 20:02 ` Derrick Stolee
2025-04-30 7:08 ` Patrick Steinhardt
2025-04-25 7:29 ` [PATCH 6/7] builtin/gc: move rerere garbage collection into separate function Patrick Steinhardt
2025-04-25 7:29 ` [PATCH 7/7] builtin/maintenance: introduce "rerere-gc" task Patrick Steinhardt
2025-04-29 20:02 ` [PATCH 0/7] builtin/maintenance: implement missing tasks compared to git-gc(1) Derrick Stolee
2025-04-30 7:08 ` Patrick Steinhardt
2025-04-30 10:25 ` [PATCH v2 0/8] " Patrick Steinhardt
2025-04-30 10:25 ` [PATCH v2 1/8] builtin/gc: fix indentation of `cmd_gc()` parameters Patrick Steinhardt
2025-04-30 10:25 ` [PATCH v2 2/8] builtin/gc: remove global variables where it trivial to do Patrick Steinhardt
2025-04-30 10:25 ` [PATCH v2 3/8] builtin/gc: move pruning of worktrees into a separate function Patrick Steinhardt
2025-04-30 10:25 ` [PATCH v2 4/8] worktree: expose function to retrieve worktree names Patrick Steinhardt
2025-04-30 10:25 ` [PATCH v2 5/8] builtin/maintenance: introduce "worktree-prune" task Patrick Steinhardt
2025-04-30 10:25 ` [PATCH v2 6/8] rerere: provide function to collect stale entries Patrick Steinhardt
2025-04-30 16:58 ` Junio C Hamano
2025-05-02 8:07 ` Patrick Steinhardt
2025-05-02 16:35 ` Junio C Hamano
2025-05-05 7:22 ` Patrick Steinhardt
2025-04-30 10:25 ` [PATCH v2 7/8] builtin/gc: move rerere garbage collection into separate function Patrick Steinhardt
2025-04-30 10:25 ` [PATCH v2 8/8] builtin/maintenance: introduce "rerere-gc" task Patrick Steinhardt
2025-04-30 10:37 ` [PATCH v2 0/8] builtin/maintenance: implement missing tasks compared to git-gc(1) Derrick Stolee
2025-05-02 8:43 ` [PATCH v3 0/7] " Patrick Steinhardt
2025-05-02 8:43 ` [PATCH v3 1/7] builtin/gc: fix indentation of `cmd_gc()` parameters Patrick Steinhardt
2025-05-02 8:43 ` [PATCH v3 2/7] builtin/gc: remove global variables where it trivial to do Patrick Steinhardt
2025-05-02 8:44 ` [PATCH v3 3/7] builtin/gc: move pruning of worktrees into a separate function Patrick Steinhardt
2025-05-02 8:44 ` Patrick Steinhardt [this message]
2025-05-05 8:42 ` [PATCH v3 4/7] worktree: expose function to retrieve worktree names Eric Sunshine
2025-05-07 7:06 ` Patrick Steinhardt
2025-05-02 8:44 ` [PATCH v3 5/7] builtin/maintenance: introduce "worktree-prune" task Patrick Steinhardt
2025-05-05 8:59 ` Eric Sunshine
2025-05-07 7:06 ` Patrick Steinhardt
2025-05-02 8:44 ` [PATCH v3 6/7] builtin/gc: move rerere garbage collection into separate function Patrick Steinhardt
2025-05-02 8:44 ` [PATCH v3 7/7] builtin/maintenance: introduce "rerere-gc" task Patrick Steinhardt
2025-05-02 14:57 ` [PATCH v3 0/7] builtin/maintenance: implement missing tasks compared to git-gc(1) Derrick Stolee
2025-05-02 21:07 ` Junio C Hamano
2025-05-05 7:32 ` Patrick Steinhardt
2025-05-05 8:51 ` [PATCH v4 " Patrick Steinhardt
2025-05-05 8:51 ` [PATCH v4 1/7] builtin/gc: fix indentation of `cmd_gc()` parameters Patrick Steinhardt
2025-05-05 8:51 ` [PATCH v4 2/7] builtin/gc: remove global variables where it trivial to do Patrick Steinhardt
2025-05-06 7:44 ` Christian Couder
2025-05-07 7:06 ` Patrick Steinhardt
2025-05-05 8:51 ` [PATCH v4 3/7] builtin/gc: move pruning of worktrees into a separate function Patrick Steinhardt
2025-05-06 7:50 ` Christian Couder
2025-05-07 7:06 ` Patrick Steinhardt
2025-05-05 8:51 ` [PATCH v4 4/7] worktree: expose function to retrieve worktree names Patrick Steinhardt
2025-05-06 8:20 ` Christian Couder
2025-05-06 16:08 ` Eric Sunshine
2025-05-05 8:51 ` [PATCH v4 5/7] builtin/maintenance: introduce "worktree-prune" task Patrick Steinhardt
2025-05-06 7:40 ` Christian Couder
2025-05-07 7:06 ` Patrick Steinhardt
2025-05-05 8:51 ` [PATCH v4 6/7] builtin/gc: move rerere garbage collection into separate function Patrick Steinhardt
2025-05-06 8:39 ` Christian Couder
2025-05-05 8:51 ` [PATCH v4 7/7] builtin/maintenance: introduce "rerere-gc" task Patrick Steinhardt
2025-05-06 9:05 ` [PATCH v4 0/7] builtin/maintenance: implement missing tasks compared to git-gc(1) Christian Couder
2025-05-07 7:21 ` [PATCH v5 0/6] " Patrick Steinhardt
2025-05-07 7:21 ` [PATCH v5 1/6] builtin/gc: fix indentation of `cmd_gc()` parameters Patrick Steinhardt
2025-05-07 7:21 ` [PATCH v5 2/6] builtin/gc: remove global variables where it is trivial to do Patrick Steinhardt
2025-05-07 7:21 ` [PATCH v5 3/6] builtin/gc: move pruning of worktrees into a separate function Patrick Steinhardt
2025-05-07 7:21 ` [PATCH v5 4/6] builtin/maintenance: introduce "worktree-prune" task Patrick Steinhardt
2025-05-07 7:21 ` [PATCH v5 5/6] builtin/gc: move rerere garbage collection into separate function Patrick Steinhardt
2025-05-07 7:21 ` [PATCH v5 6/6] builtin/maintenance: introduce "rerere-gc" task Patrick Steinhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250502-pks-maintenance-missing-tasks-v3-4-13e130d36640@pks.im \
--to=ps@pks.im \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=stolee@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).