diff options
| author | Anders Kaseorg <andersk@mit.edu> | 2021-12-01 14:15:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-01 22:18:25 -0800 |
| commit | c8dd491fa5b57ecfd9ef33ae5291eb2a9402cd59 (patch) | |
| tree | b686f1bb1a587d214f3a19efa6d56b7c65d07ae2 /worktree.h | |
| parent | 7435e7e2e7645124679eedbfb1443b8408f29219 (diff) | |
| download | git-c8dd491fa5b57ecfd9ef33ae5291eb2a9402cd59.tar.gz | |
worktree: simplify find_shared_symref() memory ownership model
Storing the worktrees list in a static variable meant that
find_shared_symref() had to rebuild the list on each call (which is
inefficient when the call site is in a loop), and also that each call
invalidated the pointer returned by the previous call (which is
confusing).
Instead, make it the caller’s responsibility to pass in the worktrees
list and manage its lifetime.
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'worktree.h')
| -rw-r--r-- | worktree.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/worktree.h b/worktree.h index 8b7c408132..9e06fcbdf3 100644 --- a/worktree.h +++ b/worktree.h @@ -143,9 +143,10 @@ void free_worktrees(struct worktree **); /* * Check if a per-worktree symref points to a ref in the main worktree * or any linked worktree, and return the worktree that holds the ref, - * or NULL otherwise. The result may be destroyed by the next call. + * or NULL otherwise. */ -const struct worktree *find_shared_symref(const char *symref, +const struct worktree *find_shared_symref(struct worktree **worktrees, + const char *symref, const char *target); /* |