summaryrefslogtreecommitdiff
path: root/worktree.h
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2016-12-12 19:04:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-12-12 23:15:07 (GMT)
commit1a248cf21d450eb911d01a89c84412c2da365e66 (patch)
tree4eb4fdd12c9a35accddac60c40bee0413a6e14a8 /worktree.h
parent6f94351b0a4dd107623a35dc9081bf31c7ddac88 (diff)
downloadgit-1a248cf21d450eb911d01a89c84412c2da365e66.zip
git-1a248cf21d450eb911d01a89c84412c2da365e66.tar.gz
git-1a248cf21d450eb911d01a89c84412c2da365e66.tar.bz2
worktree: check if a submodule uses worktrees
In a later patch we want to move around the the git directory of a submodule. Both submodules as well as worktrees are involved in placing git directories at unusual places, so their functionality may collide. To react appropriately to situations where worktrees in submodules are in use, offer a new function to query the a submodule if it uses the worktree feature. An earlier approach: "Implement submodule_get_worktrees and just count them", however: This can be done cheaply (both in new code to write as well as run time) by obtaining the list of worktrees based off that submodules git directory. However as we have loaded the variables for the current repository, the values in the submodule worktree can be wrong, e.g. * core.ignorecase may differ between these two repositories * the ref resolution is broken (refs/heads/branch in the submodule resolves to the sha1 value of the `branch` in the current repository that may not exist or have another sha1) The implementation here is just checking for any files in $GIT_COMMON_DIR/worktrees for the submodule, which ought to be sufficient if the submodule is using the current repository format, which we also check. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'worktree.h')
-rw-r--r--worktree.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/worktree.h b/worktree.h
index d59ce1f..6bfb985 100644
--- a/worktree.h
+++ b/worktree.h
@@ -28,6 +28,11 @@ struct worktree {
extern struct worktree **get_worktrees(unsigned flags);
/*
+ * Returns 1 if linked worktrees exist, 0 otherwise.
+ */
+extern int submodule_uses_worktrees(const char *path);
+
+/*
* Return git dir of the worktree. Note that the path may be relative.
* If wt is NULL, git dir of current worktree is returned.
*/