nd/worktree-move reboot
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v2 Latest7 patches 1 replyIn review
- v17 patches 19 repliesSuperseded
Patches in v2 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/7 | worktree.c: add validate_worktree()worktree.c worktree.h | +81 | 0 replies | |
| 2/7 | worktree.c: add update_worktree_location()worktree.c worktree.h | +23 | 0 replies | |
| 3/7 | worktree move: new commandDocumentation/ builtin/ contrib/ +1 more | +87 | 0 replies | |
| 4/7 | worktree move: accept destination as directorybuiltin/ strbuf.c strbuf.h +1 more | +32 | 0 replies | |
| 5/7 | worktree move: refuse to move worktrees with submodulesDocumentation/ builtin/ | +24 | 0 replies | |
| 6/7 | worktree remove: new commandDocumentation/ builtin/ contrib/ +1 more | +179 | 0 replies | |
| 7/7 | worktree remove: allow it when $GIT_WORK_TREE is already gonebuiltin/ t/ worktree.c +1 more | +36 | 0 replies |
Reviews trailers per patch
None of the 7 patches has a Reviewed-by or Acked-by.
| Patch | Kaartic Sivaraam |
|---|---|
| 1/7 | |
| 2/7 | |
| 3/7 | |
| 4/7 | |
| 5/7 | |
| 6/7 | |
| 7/7 | Noticed-by |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH v2 0/7] nd/worktree-move reboot
v2 basically fixes lots of comments from Eric (many thanks!): memory leak, typos, document updates, tests, corner case fixes.
Interdiff:
Documentation/git-worktree.txt +1 -5
@@ -36,10 +36,6 @@ The working tree's administrative files in the repository (see `git worktree prune` in the main or any linked working tree to clean up any stale administrative files. -If you move a linked working tree, you need to manually update the -administrative files so that they do not get pruned automatically. See -section "DETAILS" for more information. - If a linked working tree is stored on a portable device or network share which is not always mounted, you can prevent its administrative files from being pruned by issuing the `git worktree lock` command, optionally
@@ -211,7 +207,7 @@ thumb is do not make any assumption about whether a path belongs to $GIT_DIR or $GIT_COMMON_DIR when you need to directly access something inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path. -If you move a linked working tree, you need to update the 'gitdir' file +If you manually move a linked working tree, you need to update the 'gitdir' file in the entry's directory. For example, if a linked working tree is moved to `/newpath/test-next` and its `.git` file points to `/path/main/.git/worktrees/test-next`, then update
builtin/worktree.c +15 -12
@@ -653,21 +653,19 @@ static int move_worktree(int ac, const char **av, const char *prefix)die (_ ("'%s' is not a working tree" ), av[0 ]);if (is_main_worktree (wt))die (_ ("'%s' is a main working tree" ), av[0 ]); - -validate_no_submodules (wt); -if (is_directory (dst.buf)) {const char *sep =find_last_dir_sep (wt->path);if (!sep)die (_ ("could not figure out destination name from '%s'" ), wt->path); +strbuf_trim_trailing_dir_sep (&dst);strbuf_addstr (&dst, sep); -if (file_exists (dst.buf)) -die (_ ("target '%s' already exists" ), dst.buf); - }else if (file_exists (dst.buf)) { -die (_ ("target '%s' already exists" ), av[1 ]); } +if (file_exists (dst.buf)) +die (_ ("target '%s' already exists" ), dst.buf); + +validate_no_submodules (wt); reason =is_worktree_locked (wt);if (reason) {
@@ -677,7 +675,7 @@ static int move_worktree(int ac, const char **av, const char *prefix)die (_ ("cannot move a locked working tree" )); }if (validate_worktree (wt, &errmsg,0 )) -die (_ ("validation failed, cannot move working tree:\n%s" ), +die (_ ("validation failed, cannot move working tree: %s" ), errmsg.buf);strbuf_release (&errmsg);
@@ -686,6 +684,8 @@ static int move_worktree(int ac, const char **av, const char *prefix)update_worktree_location (wt, dst.buf); +strbuf_release (&dst); +free_worktrees (worktrees);return 0 ; }
@@ -708,6 +708,10 @@ static void check_clean_worktree(struct worktree *wt,char buf[1 ];int ret; +/* +* Until we sort this out, all submodules are "dirty" and +* will abort this function. +*/ validate_no_submodules (wt); argv_array_pushf(&child_env, "%s=%s/.git",
@@ -724,7 +728,7 @@ static void check_clean_worktree(struct worktree *wt, cp.out =-1 ; ret =start_command (&cp);if (ret) -die_errno (_ ("failed to run git-status on '%s'" ), +die_errno (_ ("failed to run 'git status' on '%s'" ), original_path); ret =xread (cp.out, buf,sizeof (buf));if (ret)
@@ -733,7 +737,7 @@ static void check_clean_worktree(struct worktree *wt,close (cp.out); ret =finish_command (&cp);if (ret) -die_errno (_ ("failed to run git-status on '%s', code %d" ), +die_errno (_ ("failed to run 'git status' on '%s', code %d" ), original_path, ret); }
@@ -748,7 +752,6 @@ static int delete_git_work_tree(struct worktree *wt) ret =-1 ; }strbuf_release (&sb); -return ret; }
@@ -797,7 +800,7 @@ static int remove_worktree(int ac, const char **av, const char *prefix)die (_ ("cannot remove a locked working tree" )); }if (validate_worktree (wt, &errmsg,WT_VALIDATE_WORKTREE_MISSING_OK )) -die (_ ("validation failed, cannot remove working tree:\n%s" ), +die (_ ("validation failed, cannot remove working tree: %s" ), errmsg.buf);strbuf_release (&errmsg);
strbuf.c +8 -0
@@ -95,6 +95,7 @@ void strbuf_trim(struct strbuf *sb)strbuf_rtrim (sb);strbuf_ltrim (sb); } +void strbuf_rtrim (struct strbuf *sb) {while (sb->len >0 &&isspace ((unsigned char )sb->buf[sb->len -1 ]))
@@ -102,6 +103,13 @@ void strbuf_rtrim(struct strbuf *sb) sb->buf[sb->len] ='\0' ; } +void strbuf_trim_trailing_dir_sep (struct strbuf *sb) +{ +while (sb->len >0 &&is_dir_sep ((unsigned char )sb->buf[sb->len -1 ])) + sb->len--; + sb->buf[sb->len] ='\0' ; +} +void strbuf_ltrim (struct strbuf *sb) {char *b = sb->buf;
strbuf.h +3 -0
@@ -179,6 +179,9 @@ extern void strbuf_trim(struct strbuf *);extern void strbuf_rtrim (struct strbuf *);extern void strbuf_ltrim (struct strbuf *); +/* Strip trailing directory separators */ +extern void strbuf_trim_trailing_dir_sep (struct strbuf *); +/** * Replace the contents of the strbuf with a reencoded form. Returns -1 * on error, 0 on success.
t/t2028-worktree-move.sh +31 -12
79 lines not on this page · raw message
worktree.c +3 -4
@@ -340,11 +340,10 @@ void update_worktree_location(struct worktree *wt, const char *path_)if (is_main_worktree (wt))die ("BUG: can't relocate main worktree" ); -strbuf_add_absolute_path (&path, path_); +strbuf_realpath (&path, path_,1 );if (fspathcmp (wt->path, path.buf)) { -write_file (git_common_path ("worktrees/%s/gitdir" , - wt->id), -"%s/.git" ,real_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 ); }