diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-02-12 10:49:35 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-02-12 22:13:35 +0100 |
commit | 9c620fc7a60c64e183a661f4df4f7b9e25501099 (patch) | |
tree | 2ade890bbdf75a6bdb0bd6718c838b815c778f3e | |
parent | worktree.c: add validate_worktree() (diff) | |
download | git-9c620fc7a60c64e183a661f4df4f7b9e25501099.tar.xz git-9c620fc7a60c64e183a661f4df4f7b9e25501099.zip |
worktree.c: add update_worktree_location()
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | worktree.c | 17 | ||||
-rw-r--r-- | worktree.h | 6 |
2 files changed, 23 insertions, 0 deletions
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 @@ -69,6 +69,12 @@ 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) */ extern void free_worktrees(struct worktree **); |