Re: [PATCH 07/10] worktree.c: add update_worktree_location()

[Eric Sunshine]

On Sat, Jun 25, 2016 at 3:54 AM, Nguyễn Thái Ngọc Duy  wrote:
> Signed-off-by: Nguyễn Thái Ngọc Duy 
> ---
> diff --git a/worktree.c b/worktree.c
> +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_);
> +   if (fspathcmp(wt->path, path.buf)) {
> +   if (!write_file_gently(git_common_path("worktrees/%s/gitdir",
> +  wt->id),
> +  "%s/.git", real_path(path.buf))) {
> +   free(wt->path);
> +   wt->path = strbuf_detach(, NULL);
> +   ret = 0;

Useless assignment?

> +   } else
> +   ret = error_errno(_("failed to update '%s'"),
> + 
> git_common_path("worktrees/%s/gitdir",
> + wt->id));
> +   }
> +   strbuf_release();
> +   return ret;
> +}

[PATCH 07/10] worktree.c: add update_worktree_location()

[Nguyễn Thái Ngọc Duy]

Signed-off-by: Nguyễn Thái Ngọc Duy 
---
 worktree.c | 25 +
 worktree.h |  6 ++
 2 files changed, 31 insertions(+)

diff --git a/worktree.c b/worktree.c
index d5149d8..9b227a4 100644
--- a/worktree.c
+++ b/worktree.c
@@ -354,6 +354,31 @@ 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_);
+   if (fspathcmp(wt->path, path.buf)) {
+   if (!write_file_gently(git_common_path("worktrees/%s/gitdir",
+  wt->id),
+  "%s/.git", real_path(path.buf))) {
+   free(wt->path);
+   wt->path = strbuf_detach(, NULL);
+   ret = 0;
+   } else
+   ret = error_errno(_("failed to update '%s'"),
+ git_common_path("worktrees/%s/gitdir",
+ wt->id));
+   }
+   strbuf_release();
+   return ret;
+}
+
 int is_worktree_being_rebased(const struct worktree *wt,
  const char *target)
 {
diff --git a/worktree.h b/worktree.h
index e782ae5..0477a3d 100644
--- a/worktree.h
+++ b/worktree.h
@@ -55,6 +55,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.526.g02eed6d

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html