[PATCH v3 1/2] worktrees: add die_if_shared_symref
- From
David Turner <dturner@twopensource.com>
- Date
- Jul 31, 2015, 19:01 UTC
- Message-ID
- <1438369297-4838-1-git-send-email-dturner@twopensource.com>
Add a new function, die_if_shared_symref, which works like die_if_checked_out, but for all references. Refactor die_if_checked_out to work in terms of die_if_shared_symref.
Soon, we will use die_if_shared_symref to protect notes merges in worktrees.
Signed-off-by: David Turner <dturner@twopensource.com> ---
Oops, forgot I had split this into two patches. This v3 includes the first patch.
--- branch.c | 20 +++++++++++++------- branch.h | 7 +++++++ 2 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/branch.c b/branch.c index c85be07..1f1b385 100644 --- a/branch.c +++ b/branch.c @@ -311,21 +311,22 @@ void remove_branch_state(void) unlink(git_path("SQUASH_MSG")); } -static void check_linked_checkout(const char *branch, const char *id) +static void check_linked_checkout(const char *symref, const char *branch, + const char *id) { struct strbuf sb = STRBUF_INIT; struct strbuf path = STRBUF_INIT; struct strbuf gitdir = STRBUF_INIT; /* - * $GIT_COMMON_DIR/HEAD is practically outside + * $GIT_COMMON_DIR/$symref is practically outside * $GIT_DIR so resolve_ref_unsafe() won't work (it * uses git_path). Parse the ref ourselves. */ if (id) - strbuf_addf(&path, "%s/worktrees/%s/HEAD", get_git_common_dir(), id); + strbuf_addf(&path, "%s/worktrees/%s/%s", get_git_common_dir(), id, symref); else - strbuf_addf(&path, "%s/HEAD", get_git_common_dir()); + strbuf_addf(&path, "%s/%s", get_git_common_dir(), symref); if (!strbuf_readlink(&sb, path.buf, 0)) { if (!starts_with(sb.buf, "refs/") || @@ -356,13 +357,13 @@ done: strbuf_release(&gitdir); } -void die_if_checked_out(const char *branch) +void die_if_shared_symref(const char *symref, const char *branch) { struct strbuf path = STRBUF_INIT; DIR *dir; struct dirent *d; - check_linked_checkout(branch, NULL); + check_linked_checkout(symref, branch, NULL); strbuf_addf(&path, "%s/worktrees", get_git_common_dir()); dir = opendir(path.buf); @@ -373,7 +374,12 @@ void die_if_checked_out(const char *branch) while ((d = readdir(dir)) != NULL) { if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, "..")) continue; - check_linked_checkout(branch, d->d_name); + check_linked_checkout(symref, branch, d->d_name); } closedir(dir); } + +void die_if_checked_out(const char *branch) +{ + die_if_shared_symref("HEAD", branch); +} diff --git a/branch.h b/branch.h index 58aa45f..b2fca30 100644 --- a/branch.h +++ b/branch.h @@ -59,4 +59,11 @@ extern int read_branch_desc(struct strbuf *, const char *branch_name); */ extern void die_if_checked_out(const char *branch); +/* + * Check if a symref points to a branch in the main worktree or any linked + * worktree and die (with a message describing its checkout location) if + * it is. + */ +extern void die_if_shared_symref(const char *symref, const char *branch); + #endif
-- 2.0.4.315.gad8727a-twtrsrc