add "git worktree repair" command
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v2 Latest5 patches 1 replyIn review
- v15 patches 9 repliesSuperseded
Changes in v2 from the cover letter
* employ proper terminology s/gitlink/gitfile/g (junio[2])
* tighten documentation slightly (junio[2])
* rename callback function and typedef s/cb/fn/g (junio[2])
* give concrete callback function more meaningful name (junio[2])
* employ explicit name for callback data (junio[2])
* explicitly check that worktree path is directory, not file, and bail with meaningful error message; add associated test (junio[2])
* fix empty-function style violation (junio[2])
* refine worktree repair callback typedef (sunshine)
* pacify GCC -Werror=main (dscho[3])
* pacify Sparse s/0/NULL/ (ramsay[4])
Patches in v2 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/5 | worktree: add skeleton "repair" commandDocumentation/ builtin/ t/ | +32 | 0 replies | |
| 2/5 | worktree: teach "repair" to fix worktree back-links to main worktreeDocumentation/ builtin/ t/ +2 more | +175 | 0 replies | |
| 3/5 | worktree: teach "repair" to fix outgoing links to worktreesDocumentation/ builtin/ t/ +2 more | +188 | 0 replies | |
| 4/5 | init: teach --separate-git-dir to repair linked worktreesbuiltin/ t/ | +13 | 0 replies | |
| 5/5 | init: make --separate-git-dir work from within linked worktreebuiltin/ t/ | +43 | 0 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.
Cover letter [PATCH v2 0/5] add "git worktree repair" command
This is a re-roll of [1] which adds a "git worktree repair" command and which fixes bugs with "git init --separate-git-dir" related to worktrees.
Changes since v1:
* employ proper terminology s/gitlink/gitfile/g (junio[2])
* tighten documentation slightly (junio[2])
* rename callback function and typedef s/cb/fn/g (junio[2])
* give concrete callback function more meaningful name (junio[2])
* employ explicit name for callback data (junio[2])
* explicitly check that worktree path is directory, not file, and bail with meaningful error message; add associated test (junio[2])
* fix empty-function style violation (junio[2])
* refine worktree repair callback typedef (sunshine)
* pacify GCC -Werror=main (dscho[3])
* pacify Sparse s/0/NULL/ (ramsay[4])
[1]: https://lore.kernel.org/git/[email protected]/
[2]: https://lore.kernel.org/git/[email protected]/
[3]: https://lore.kernel.org/git/[email protected]/
[4]: https://lore.kernel.org/git/[email protected]/
Eric Sunshine (5):
worktree: add skeleton "repair" command
worktree: teach "repair" to fix worktree back-links to main worktree
worktree: teach "repair" to fix outgoing links to worktrees
init: teach --separate-git-dir to repair linked worktrees
init: make --separate-git-dir work from within linked worktree
Documentation/git-worktree.txt | 26 ++++- builtin/init-db.c | 26 +++++ builtin/worktree.c | 30 ++++++ t/t0001-init.sh | 28 ++++++ t/t2406-worktree-repair.sh | 179 +++++++++++++++++++++++++++++++++ worktree.c | 135 +++++++++++++++++++++++++ worktree.h | 23 +++++ 7 files changed, 445 insertions(+), 2 deletions(-) create mode 100755 t/t2406-worktree-repair.sh
Interdiff against v1:
Documentation/git-worktree.txt +2 -2
@@ -121,8 +121,8 @@ become corrupted or outdated due to external factors. + For instance, if the main working tree (or bare repository) is moved, linked working trees will be unable to locate it. Running `repair` in -the recently-moved main working tree will reestablish the connection -from linked working trees back to the main working tree. +the main working tree will reestablish the connection from linked +working trees back to the main working tree. + Similarly, if a linked working tree is moved without using `git worktree move`, the main working tree (or bare repository) will be unable to
builtin/init-db.c +1 -1
@@ -661,7 +661,7 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)if (chdir (mainwt.buf) <0 )die_errno (_ ("cannot chdir to %s" ), mainwt.buf);strbuf_release (&mainwt); - git_dir =strbuf_detach (&sb,0 ); + git_dir =strbuf_detach (&sb,NULL ); }strbuf_release (&sb); }
builtin/worktree.c +7 -6
@@ -1030,13 +1030,14 @@ static int remove_worktree(int ac, const char **av, const char *prefix)return ret; } -static void repair_cb (int iserr,const char *path,const char *msg,void *cb_data) +static void report_repair (int iserr,const char *path,const char *msg,void *cb_data) { -if (!iserr) +if (!iserr) {printf_ln (_ ("repair: %s: %s" ), msg, path); -else { + }else { +int *exit_status = (int *)cb_data;fprintf_ln (stderr,_ ("error: %s: %s" ), msg, path); - *(int *)cb_data =1 ; + *exit_status =1 ; } }
@@ -1050,10 +1051,10 @@ static int repair(int ac, const char **av, const char *prefix)int rc =0 ; ac =parse_options (ac, av, prefix, options, worktree_usage,0 ); -repair_worktrees (repair_cb, &rc); +repair_worktrees (report_repair, &rc); p = ac >0 ? av : self;for (; *p; p++) -repair_worktree_at_path (*p, repair_cb, &rc); +repair_worktree_at_path (*p, report_repair, &rc);return rc; }
t/t2406-worktree-repair.sh +20 -10
@@ -17,6 +17,16 @@ test_expect_success 'skip missing worktree' ' test_must_be_empty err ' +test_expect_success 'worktree path not directory' ' + test_when_finished "git worktree prune" && + git worktree add --detach notdir && + rm -rf notdir && + >notdir && + test_must_fail git worktree repair >out 2>err && + test_must_be_empty out && + test_i18ngrep "not a directory" err +' + test_expect_success "don't clobber .git repo" ' test_when_finished "rm -rf repo && git worktree prune" && git worktree add --detach repo &&
@@ -27,7 +37,7 @@ test_expect_success "don't clobber .git repo" ' test_i18ngrep ".git is not a file" err ' -test_corrupt_gitlink () { +test_corrupt_gitfile () { butcher=$1 && problem=$2 && repairdir=${3:-.} &&
@@ -43,30 +53,30 @@ test_corrupt_gitlink () { } test_expect_success 'repair missing .git file' ' - test_corrupt_gitlink "rm -f corrupt/.git" ".git link broken" + test_corrupt_gitfile "rm -f corrupt/.git" ".git file broken" ' test_expect_success 'repair bogus .git file' ' - test_corrupt_gitlink "echo \"gitdir: /nowhere\" >corrupt/.git" \ - ".git link broken" + test_corrupt_gitfile "echo \"gitdir: /nowhere\" >corrupt/.git" \ + ".git file broken" ' test_expect_success 'repair incorrect .git file' ' test_when_finished "rm -rf other && git worktree prune" && test_create_repo other && other=$(git -C other rev-parse --absolute-git-dir) && - test_corrupt_gitlink "echo \"gitdir: $other\" >corrupt/.git" \ - ".git link incorrect" + test_corrupt_gitfile "echo \"gitdir: $other\" >corrupt/.git" \ + ".git file incorrect" ' test_expect_success 'repair .git file from main/.git' ' - test_corrupt_gitlink "rm -f corrupt/.git" ".git link broken" .git + test_corrupt_gitfile "rm -f corrupt/.git" ".git file broken" .git ' test_expect_success 'repair .git file from linked worktree' ' test_when_finished "rm -rf other && git worktree prune" && git worktree add --detach other && - test_corrupt_gitlink "rm -f corrupt/.git" ".git link broken" other + test_corrupt_gitfile "rm -f corrupt/.git" ".git file broken" other ' test_expect_success 'repair .git file from bare.git' '
@@ -94,14 +104,14 @@ test_expect_success 'repo not found; .git not file' ' test_i18ngrep ".git is not a file" err ' -test_expect_success 'repo not found; .git link broken' ' +test_expect_success 'repo not found; .git file broken' ' test_when_finished "rm -rf orig moved && git worktree prune" && git worktree add --detach orig && echo /invalid >orig/.git && mv orig moved && test_must_fail git worktree repair moved >out 2>err && test_must_be_empty out && - test_i18ngrep ".git link broken" err + test_i18ngrep ".git file broken" err ' test_expect_success 'repair broken gitdir' '
worktree.c +33 -25
135 lines not on this page · raw message
worktree.h +11 -10
@@ -89,27 +89,28 @@ int validate_worktree(const struct worktree *wt,void update_worktree_location (struct worktree *wt,const char *path_); -typedef void worktree_repair_cb (int iserr,const char *path,const char *msg, -void *cb_data); +typedef void (*worktree_repair_fn )(int iserr,const char *path, +const char *msg,void *cb_data);/* * Visit each registered linked worktree and repair corruptions. For each -* repair made or error encountered while attempting a repair, the callback, if -* non-NULL, is called with the path of the worktree and a description of the -* repair or error, along with the callback user-data. +* repair made or error encountered while attempting a repair, the callback +* function, if non-NULL, is called with the path of the worktree and a +* description of the repair or error, along with the callback user-data. */ -void repair_worktrees (worktree_repair_cb *,void *cb_data); +void repair_worktrees (worktree_repair_fn ,void *cb_data);/* * Repair administrative files corresponding to the worktree at the given path. -* The worktree's .git link pointing at the repository must be intact for the +* The worktree's .git file pointing at the repository must be intact for the * repair to succeed. Useful for re-associating an orphaned worktree with the * repository if the worktree has been moved manually (without using "git * worktree move"). For each repair made or error encountered while attempting -* a repair, the callback, if non-NULL, is called with the path of the worktree -* and a description of the repair or error, along with the callback user-data. +* a repair, the callback function, if non-NULL, is called with the path of the +* worktree and a description of the repair or error, along with the callback +* user-data. */ -void repair_worktree_at_path (const char *,worktree_repair_cb *,void *cb_data); +void repair_worktree_at_path (const char *,worktree_repair_fn ,void *cb_data);/* * Free up the memory for worktree(s)
Signature · 1 line
2.28.0.531.g41c3d8a546