[PATCH 2/6] worktree.c: add update_worktree_location()
From: Nguyễn Thái Ngọc Duy <hidden>
Date: 2017-01-08 09:40:59
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Nguyễn Thái Ngọc Duy <redacted> --- worktree.c | 21 +++++++++++++++++++++ worktree.h | 6 ++++++ 2 files changed, 27 insertions(+)
diff --git a/worktree.c b/worktree.c
index 929072a..7684951 100644
--- a/worktree.c
+++ b/worktree.c@@ -354,6 +354,27 @@ int validate_worktree(const struct worktree *wt, int quiet) return 0; } +int update_worktree_location(struct worktree *wt, const char *path_) +{ + struct strbuf path = STRBUF_INIT; + int ret = 0; + + if (is_main_worktree(wt)) + return 0; + + strbuf_add_absolute_path(&path, path_); + if (fspathcmp(wt->path, path.buf)) { + write_file(git_common_path("worktrees/%s/gitdir", + wt->id), + "%s/.git", real_path(path.buf)); + free(wt->path); + wt->path = strbuf_detach(&path, NULL); + ret = 0; + } + strbuf_release(&path); + return ret; +} + int is_worktree_being_rebased(const struct worktree *wt, const char *target) {
diff --git a/worktree.h b/worktree.h
index 4433db2..1ee03f4 100644
--- a/worktree.h
+++ b/worktree.h@@ -57,6 +57,12 @@ extern const char *is_worktree_locked(struct worktree *wt); */ extern int validate_worktree(const struct worktree *wt, int quiet); +/* + * Update worktrees/xxx/gitdir with the new path. + */ +extern int update_worktree_location(struct worktree *wt, + const char *path_); + /* * Free up the memory for worktree(s) */
--
2.8.2.524.g6ff3d78