Browse Source

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>
maint
Nguyễn Thái Ngọc Duy 7 years ago committed by Junio C Hamano
parent
commit
9c620fc7a6
  1. 17
      worktree.c
  2. 6
      worktree.h

17
worktree.c

@ -326,6 +326,23 @@ done: @@ -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)
{

6
worktree.h

@ -68,6 +68,12 @@ extern const char *is_worktree_locked(struct worktree *wt); @@ -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)
*/

Loading…
Cancel
Save