Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-03-20 01:03:11 +0300
committerJunio C Hamano <gitster@pobox.com>2023-03-20 01:03:11 +0300
commit96a806f87a379fbc54b5cdb889518e9540d954c9 (patch)
treef0318d5114575e8f6d8b6fca5579d2b1e13feaa1 /worktree.h
parentc79786c486cb84e2f9dad41a04d982bb23075815 (diff)
parent894ea945095b74542c6c4f4aefbe20f5b68be437 (diff)
Merge branch 'rj/avoid-switching-to-already-used-branch'
A few subcommands have been taught to stop users from working on a branch that is being used in another worktree linked to the same repository. * rj/avoid-switching-to-already-used-branch: switch: reject if the branch is already checked out elsewhere (test) rebase: refuse to switch to a branch already checked out elsewhere (test) branch: fix die_if_checked_out() when ignore_current_worktree worktree: introduce is_shared_symref()
Diffstat (limited to 'worktree.h')
-rw-r--r--worktree.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/worktree.h b/worktree.h
index 2baeca2a8a..ce45b66de9 100644
--- a/worktree.h
+++ b/worktree.h
@@ -149,6 +149,12 @@ const struct worktree *find_shared_symref(struct worktree **worktrees,
const char *target);
/*
+ * Returns true if a symref points to a ref in a worktree.
+ */
+int is_shared_symref(const struct worktree *wt,
+ const char *symref, const char *target);
+
+/*
* Similar to head_ref() for all HEADs _except_ one from the current
* worktree, which is covered by head_ref().
*/