nd/worktree-move update
Get series with b4
b4 am [email protected]Versions newest first
- v1 Latest11 patches 13 repliesIn review
Patches in v1 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/11 | worktree.c: zero new 'struct worktree' on allocationworktree.c | +2 | 0 replies | |
| 2/11 | worktree: reorder an if statementbuiltin/ | +3 | 0 replies | |
| 3/11 | get_worktrees() must return main worktree as first item even on errorbuiltin/ t/ worktree.c | +28 | 0 replies | |
| 4/11 | worktree.c: get_worktrees() takes a new flag argumentbranch.c builtin/ builtin/ +2 more | +8 | 0 replies | |
| 5/11 | worktree list: keep the list sortedbuiltin/ t/ worktree.c +1 more | +36 | 0 replies | |
| 6/11 | worktree.c: add validate_worktree()worktree.c worktree.h | +68 | 0 replies | |
| 7/11 | worktree.c: add update_worktree_location()worktree.c worktree.h | +27 | 0 replies | |
| 8/11 | worktree move: new commandDocumentation/ builtin/ contrib/ +1 more | +81 | 0 replies | |
| 9/11 | worktree move: accept destination as directorybuiltin/ | +18 | 0 replies | |
| 10/11 | worktree move: refuse to move worktrees with submodulesbuiltin/ | +23 | 0 replies | |
| 11/11 | worktree remove: new commandDocumentation/ builtin/ contrib/ +1 more | +121 | 0 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.
Cover letter [PATCH 00/11] nd/worktree-move update
This squashes two changes from Johannes and Ramsay:
builtin/worktree.c +1 -1
@@ -528,7 +528,7 @@ static int unlock_worktree(int ac, const char **av, const char *prefix)static void validate_no_submodules (const struct worktree *wt) { -struct index_state istate = {0 }; +struct index_state istate = {NULL };int i, found_submodules =0 ;if (read_index_from (&istate,worktree_git_path (wt,"index" )) >0 ) {
t/t2028-worktree-move.sh +4 -3
@@ -71,13 +71,14 @@ test_expect_success 'move locked worktree' ' ' test_expect_success 'move worktree' ' + toplevel="$(pwd)" && git worktree move source destination && test_path_is_missing source && git worktree list --porcelain | grep "^worktree" >actual && cat <<-EOF >expected && - worktree $TRASH_DIRECTORY - worktree $TRASH_DIRECTORY/destination - worktree $TRASH_DIRECTORY/elsewhere + worktree $toplevel + worktree $toplevel/destination + worktree $toplevel/elsewhere EOF test_cmp expected actual && git -C destination log --format=%s >actual2 &&
Nguyễn Thái Ngọc Duy (11):
worktree.c: zero new 'struct worktree' on allocation
worktree: reorder an if statement
get_worktrees() must return main worktree as first item even on error worktree.c: get_worktrees() takes a new flag argument worktree list: keep the list sorted
worktree.c: add validate_worktree()
worktree.c: add update_worktree_location()
worktree move: new command
worktree move: accept destination as directory
worktree move: refuse to move worktrees with submodules worktree remove: new command
Documentation/git-worktree.txt | 28 ++++-- branch.c | 2 +- builtin/branch.c | 2 +- builtin/worktree.c | 176 +++++++++++++++++++++++++++++++-- contrib/completion/git-completion.bash | 5 +- t/t2027-worktree-list.sh | 40 ++++++++ t/t2028-worktree-move.sh | 57 +++++++++++ worktree.c | 126 +++++++++++++++++++---- worktree.h | 15 ++- 9 files changed, 410 insertions(+), 41 deletions(-)
Signature · 1 line
2.11.0.157.gd943d85