From 9c620fc7a60c64e183a661f4df4f7b9e25501099 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Date: Mon, 12 Feb 2018 16:49:35 +0700 Subject: [PATCH] worktree.c: add update_worktree_location() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- worktree.c | 17 +++++++++++++++++ worktree.h | 6 ++++++ 2 files changed, 23 insertions(+) diff --git a/worktree.c b/worktree.c index b238d87bf1..0373faf0dc 100644 --- a/worktree.c +++ b/worktree.c @@ -326,6 +326,23 @@ done: return ret; } +void update_worktree_location(struct worktree *wt, const char *path_) +{ + struct strbuf path = STRBUF_INIT; + + if (is_main_worktree(wt)) + die("BUG: can't relocate main worktree"); + + strbuf_realpath(&path, path_, 1); + if (fspathcmp(wt->path, path.buf)) { + write_file(git_common_path("worktrees/%s/gitdir", wt->id), + "%s/.git", path.buf); + free(wt->path); + wt->path = strbuf_detach(&path, NULL); + } + strbuf_release(&path); +} + int is_worktree_being_rebased(const struct worktree *wt, const char *target) { diff --git a/worktree.h b/worktree.h index cb577de8cd..a913428c3d 100644 --- a/worktree.h +++ b/worktree.h @@ -68,6 +68,12 @@ extern const char *is_worktree_locked(struct worktree *wt); extern int validate_worktree(const struct worktree *wt, struct strbuf *errmsg); +/* + * Update worktrees/xxx/gitdir with the new path. + */ +extern void update_worktree_location(struct worktree *wt, + const char *path_); + /* * Free up the memory for worktree(s) */ -- 2.43.2