git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 00/20] "git worktree move" preview

From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date
Feb 3, 2016, 09:35 UTC
Message-ID
<1454492150-10628-1-git-send-email-pclouds@gmail.com>

This is the rough first cut of "git worktree move" for early feedback. The series adds "git worktree move" which can

 - move a linked worktree to another place
 - move .git repository away
The first use case is obvious. The second less so.

Main worktree has always been an odd ball because it does not always behave like a linked worktree. You can't move it (because you'll be moving the repo along), you don't know where it is from 'worktree list' because it's not tracked the same way. The move of .git dir will automatically convert the main worktree to linked one, making it equal to all other worktrees.

At the code level, it should be noted that I import copy_file() from busybox for whole directory copy that preserves file permission and stuff. Either that or I need to rely on POSIX command "cp" or "mv". But that would make Windows adaptation harder later on.

A little off topic. The first two patches adds sys_error() that, like die_errno(), automatically do strerror(). There's a 38 patches series to convert error("...: %s", ..., strerror(errno)) to use it. I think it's a good idea. So unless somebody objects, I'll post it some time later.

Nguyễn Thái Ngọc Duy (20):
  usage.c: move format processing out of die_errno()
  usage.c: add sys_error() that prints strerror() automatically
  path.c: add git_common_path() and strbuf_git_common_path()
  path.c: add is_git_path_shared()
  copy.c: add copy_dir_recursively()
  worktree.c: use is_dot_or_dotdot()
  worktree.c: store "id" instead of "git_dir"
  worktree.c: add clear_worktree()
  worktree.c: add find_worktree_by_path()
  worktree.c: add is_main_worktree()
  worktree.c: recognize no main worktree
  worktree.c: add update_worktree_location()
  worktree.c: add update_worktree_gitfile()
  worktree.c: add collect_per_worktree_git_paths()
  worktree: avoid 0{40}, too many zeroes, hard to read
  worktree: simplify prefixing paths
  worktree: add "move" commmand
  worktree: refactor add_worktree()
  worktree: move repo, simple case
  worktree: move repo, convert main worktree
 builtin/worktree.c                | 297 ++++++++++++++++++++++++------
 cache.h                           |   6 +
 copy.c                            | 371 ++++++++++++++++++++++++++++++++++++++
 git-compat-util.h                 |   1 +
 path.c                            |  56 +++++-
 t/t2028-worktree-move.sh (new +x) |  77 ++++++++
 usage.c                           |  35 +++-
 worktree.c                        | 161 +++++++++++++++--
 worktree.h                        |  42 ++++-
 9 files changed, 963 insertions(+), 83 deletions(-)
 create mode 100755 t/t2028-worktree-move.sh
-- 
2.7.0.377.g4cd97dd
Next: Nguyễn Thái Ngọc Duy
Message 1 of 50 in “"git worktree move" preview”
  1. 00/20 "git worktree move" previewNguyễn Thái Ngọc Duy, Feb 3, 2016
  2. 01/20 usage.c: move format processing out of die_errno()Nguyễn Thái Ngọc Duy, Feb 3, 2016
  3. 02/20 usage.c: add sys_error() that prints strerror() automaticallyNguyễn Thái Ngọc Duy, Feb 3, 2016
  4. 03/20 path.c: add git_common_path() and strbuf_git_common_path()Nguyễn Thái Ngọc Duy, Feb 3, 2016
  5. 04/20 path.c: add is_git_path_shared()Nguyễn Thái Ngọc Duy, Feb 3, 2016
  6. 05/20 copy.c: add copy_dir_recursively()Nguyễn Thái Ngọc Duy, Feb 3, 2016
  7. 06/20 worktree.c: use is_dot_or_dotdot()Nguyễn Thái Ngọc Duy, Feb 3, 2016
  8. 07/20 worktree.c: store "id" instead of "git_dir"Nguyễn Thái Ngọc Duy, Feb 3, 2016
  9. 08/20 worktree.c: add clear_worktree()Nguyễn Thái Ngọc Duy, Feb 3, 2016
  10. 09/20 worktree.c: add find_worktree_by_path()Nguyễn Thái Ngọc Duy, Feb 3, 2016
  11. 10/20 worktree.c: add is_main_worktree()Nguyễn Thái Ngọc Duy, Feb 3, 2016
  12. 11/20 worktree.c: recognize no main worktreeNguyễn Thái Ngọc Duy, Feb 3, 2016
  13. 12/20 worktree.c: add update_worktree_location()Nguyễn Thái Ngọc Duy, Feb 3, 2016
  14. 13/20 worktree.c: add update_worktree_gitfile()Nguyễn Thái Ngọc Duy, Feb 3, 2016
  15. 14/20 worktree.c: add collect_per_worktree_git_paths()Nguyễn Thái Ngọc Duy, Feb 3, 2016
  16. 15/20 worktree: avoid 0{40}, too many zeroes, hard to readNguyễn Thái Ngọc Duy, Feb 3, 2016
  17. 16/20 worktree: simplify prefixing pathsNguyễn Thái Ngọc Duy, Feb 3, 2016
  18. 17/20 worktree: add "move" commmandNguyễn Thái Ngọc Duy, Feb 3, 2016
  19. 18/20 worktree: refactor add_worktree()Nguyễn Thái Ngọc Duy, Feb 3, 2016
  20. 19/20 worktree: move repo, simple caseNguyễn Thái Ngọc Duy, Feb 3, 2016
  21. 20/20 worktree: move repo, convert main worktreeNguyễn Thái Ngọc Duy, Feb 3, 2016
  22. 00/26 worktree lock, move, remove and unlockNguyễn Thái Ngọc Duy, Feb 16, 2016
  23. 01/26 usage.c: move format processing out of die_errno()Nguyễn Thái Ngọc Duy, Feb 16, 2016
  24. 02/26 usage.c: add sys_error() that prints strerror() automaticallyNguyễn Thái Ngọc Duy, Feb 16, 2016
  25. 03/26 copy.c: import copy_file() from busyboxNguyễn Thái Ngọc Duy, Feb 16, 2016
  26. 04/26 copy.c: delete unused code in copy_file()Nguyễn Thái Ngọc Duy, Feb 16, 2016
  27. 05/26 copy.c: convert bb_(p)error_msg to (sys_)errorNguyễn Thái Ngọc Duy, Feb 16, 2016
  28. 06/26 copy.c: style fixNguyễn Thái Ngọc Duy, Feb 16, 2016
  29. 07/26 copy.c: convert copy_file() to copy_dir_recursively()Nguyễn Thái Ngọc Duy, Feb 16, 2016
  30. 08/26 completion: support git-worktreeNguyễn Thái Ngọc Duy, Feb 16, 2016
  31. 09/26 git-worktree.txt: keep subcommand listing in alphabetical orderNguyễn Thái Ngọc Duy, Feb 16, 2016
  32. 10/26 wrapper.c: allow to create an empty file with write_file()Nguyễn Thái Ngọc Duy, Feb 16, 2016
  33. Junio C HamanoFeb 17, 2016
  34. Duy NguyenFeb 18, 2016
  35. 11/26 path.c: add git_common_path() and strbuf_git_common_path()Nguyễn Thái Ngọc Duy, Feb 16, 2016
  36. 12/26 worktree.c: use is_dot_or_dotdot()Nguyễn Thái Ngọc Duy, Feb 16, 2016
  37. 13/26 worktree.c: store "id" instead of "git_dir"Nguyễn Thái Ngọc Duy, Feb 16, 2016
  38. 14/26 worktree.c: add clear_worktree()Nguyễn Thái Ngọc Duy, Feb 16, 2016
  39. 15/26 worktree.c: add find_worktree_by_path()Nguyễn Thái Ngọc Duy, Feb 16, 2016
  40. 16/26 worktree.c: add is_main_worktree()Nguyễn Thái Ngọc Duy, Feb 16, 2016
  41. 17/26 worktree.c: add validate_worktree()Nguyễn Thái Ngọc Duy, Feb 16, 2016
  42. 18/26 worktree.c: add update_worktree_location()Nguyễn Thái Ngọc Duy, Feb 16, 2016
  43. 19/26 worktree.c: add is_worktree_locked()Nguyễn Thái Ngọc Duy, Feb 16, 2016
  44. 20/26 worktree: avoid 0{40}, too many zeroes, hard to readNguyễn Thái Ngọc Duy, Feb 16, 2016
  45. 21/26 worktree: simplify prefixing pathsNguyễn Thái Ngọc Duy, Feb 16, 2016
  46. 22/26 worktree: add "lock" commandNguyễn Thái Ngọc Duy, Feb 16, 2016
  47. 23/26 worktree: add "unlock" commandNguyễn Thái Ngọc Duy, Feb 16, 2016
  48. 24/26 worktree: add "move" commmandNguyễn Thái Ngọc Duy, Feb 16, 2016
  49. 25/26 worktree move: accept destination as directoryNguyễn Thái Ngọc Duy, Feb 16, 2016
  50. 26/26 worktree: add "remove" commandNguyễn Thái Ngọc Duy, Feb 16, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.