Hello, Here is v2 of my series. I realized that Gitgitgadget failed to parse the Cc: footer in my PR description and thus both v1 and v2 got sent to the list without any Cc:s. Cheers, Philippe. > Le 21 janv. 2020 à 10:01, Philippe Blain via GitGitGadget <gitgitgadget@xxxxxxxxx> a écrit : > > Changes since v1: > > * revert the addition of a dash in "file1 updated" by correctly using the > 'tag' argument of test_commit > * improve the commit message for the 3rd patch, as suggested by Eric > * fix spacing when redirecting into 'expect' and 'actual' > * harden the tests by echoing expected values into expect, as suggested by > Stolee (I did that in both tests) > * remove test_might_fail and use test_expect_code > * add the 'git log' test suggested by Stolee > > v1: This series fixes the behaviour of git checkout/reset/read-tree > --recurse-submodules when they are called in a linked worktree (created by > git worktree add). > > Although submodules are cloned in $GIT_COMMON_DIR/worktrees/<name>/modules > upon issuing git submodule update in the linked worktree, any invocation of > git checkout/reset/read-tree --recurse-submodules that changes the state of > the submodule(s) will incorrectly operate on the repositories of the > submodules in the main worktree, i.e. the ones at $GIT_COMMON_DIR/modules/. > > The fourth patch fixes this behaviour by using get_git_dir() instead of > git_common_dir() in submodule.c::submodule_move_head and > submodule.c::submodule_unset_core_worktree to construct the path to the > submodule repository. > > The first 3 patches are clean-up patches on t7410-submodule-checkout-to.sh > (renamed to t2405-worktree-submodule.sh) to bring it up to date. > > Cc:Max Kirillov max@xxxxxxxxxx [max@xxxxxxxxxx] Brandon Williams > bwilliams.eng@xxxxxxxxx [bwilliams.eng@xxxxxxxxx] Jonathan Tan > jonathantanmy@xxxxxxxxxx [jonathantanmy@xxxxxxxxxx] Stefan Beller > stefanbeller@xxxxxxxxx [stefanbeller@xxxxxxxxx] Nguyễn Thái Ngọc Duy > pclouds@xxxxxxxxx [pclouds@xxxxxxxxx] Eric Sunshine sunshine@xxxxxxxxxxxxxx > [sunshine@xxxxxxxxxxxxxx] Derrick Stolee stolee@xxxxxxxxx [stolee@xxxxxxxxx] > > Philippe Blain (4): > t7410: rename to t2405-worktree-submodule.sh > t2405: use git -C and test_commit -C instead of subshells > t2405: clarify test descriptions and simplify test > submodule.c: use get_git_dir() instead of get_git_common_dir() > > submodule.c | 6 +-- > t/t2405-worktree-submodule.sh | 90 ++++++++++++++++++++++++++++++++ > t/t7410-submodule-checkout-to.sh | 77 --------------------------- > 3 files changed, 93 insertions(+), 80 deletions(-) > create mode 100755 t/t2405-worktree-submodule.sh > delete mode 100755 t/t7410-submodule-checkout-to.sh > > > base-commit: b4615e40a8125477e18490d868f7b65954372b43 > Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-523%2Fphil-blain%2Fcheckout-recurse-in-linked-worktree-v2 > Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-523/phil-blain/checkout-recurse-in-linked-worktree-v2 > Pull-Request: https://github.com/gitgitgadget/git/pull/523 > > Range-diff vs v1: > > 1: ff33339690 = 1: 1a4eae1ef5 t7410: rename to t2405-worktree-submodule.sh > 2: 5060ce3d64 ! 2: f06d2c4aa5 t2405: use git -C and test_commit -C instead of subshells > @@ -41,7 +41,7 @@ > + git init origin/main && > + git -C origin/main submodule add ../sub && > + git -C origin/main commit -m "add sub" && > -+ test_commit -C origin/sub "file1-updated" file1 file1updated && > ++ test_commit -C origin/sub "file1 updated" file1 file1updated file1updated && > git -C origin/main/sub pull && > - ( > - cd origin/main && > @@ -53,30 +53,3 @@ > ' > > test_expect_success 'setup: clone' ' > -@@ > - > - test_expect_failure 'can see submodule diffs just after checkout' ' > - git -C default_checkout/main diff --submodule master"^!" >out && > -- grep "file1 updated" out > -+ grep "file1-updated" out > - ' > - > - test_expect_success 'checkout main and initialize independent clones' ' > -@@ > - > - test_expect_success 'can see submodule diffs after independent cloning' ' > - git -C fully_cloned_submodule/main diff --submodule master"^!" >out && > -- grep "file1 updated" out > -+ grep "file1-updated" out > - ' > - > - test_expect_success 'checkout sub manually' ' > -@@ > - > - test_expect_success 'can see submodule diffs after manual checkout of linked submodule' ' > - git -C linked_submodule/main diff --submodule master"^!" >out && > -- grep "file1 updated" out > -+ grep "file1-updated" out > - ' > - > - test_done > 3: 6e0e664026 ! 3: 10727275a2 t2405: clarify test descriptions and simplify test > @@ -10,7 +10,13 @@ > descriptions were not updated, keeping 'checkout' instead of using the new > terminology (linked worktrees). > > - Clarify the tests by using the right terminology. While at it, remove some unnecessary > + Also, in the test each worktree is created in > + $TRASH_DIRECTORY/<leading-directory>/main, where the name of <leading-directory> > + carries some information about what behavior each test verifies. This directory > + structure is not mandatory for the tests; the worktrees can live next to one > + another in the trash directory. > + > + Clarify the tests by using the right terminology, and remove the unnecessary > leading directories such that all superproject worktrees are directly next to one > another in the trash directory. > > @@ -44,7 +50,7 @@ > - git -C default_checkout/main diff --submodule master"^!" >out && > +test_expect_failure 'submodule is checked out just after worktree add' ' > + git -C worktree diff --submodule master"^!" >out && > - grep "file1-updated" out > + grep "file1 updated" out > ' > > -test_expect_success 'checkout main and initialize independent clones' ' > @@ -60,7 +66,7 @@ > - git -C fully_cloned_submodule/main diff --submodule master"^!" >out && > +test_expect_success 'submodule is checked out just after submodule update in linked worktree' ' > + git -C worktree-submodule-update diff --submodule master"^!" >out && > - grep "file1-updated" out > + grep "file1 updated" out > ' > > -test_expect_success 'checkout sub manually' ' > @@ -76,6 +82,6 @@ > - git -C linked_submodule/main diff --submodule master"^!" >out && > +test_expect_success 'submodule is checked out after manually adding submodule worktree' ' > + git -C linked_submodule diff --submodule master"^!" >out && > - grep "file1-updated" out > + grep "file1 updated" out > ' > > 4: 72cdb2f95d ! 4: 614bccd31b submodule.c: use get_git_dir() instead of get_git_common_dir() > @@ -24,7 +24,7 @@ > This leads to an incorrect (and confusing!) state in the submodule working tree > of the main superproject worktree. > > - Additionnally, if switching to a commit where the submodule is not present, > + Additionally, if switching to a commit where the submodule is not present, > submodule_unset_core_worktree will be called and will incorrectly remove > 'core.wortree' from the config file of the submodule in the main superproject worktree, > $GIT_COMMON_DIR/modules/<name>/config. > @@ -75,30 +75,41 @@ > + test_commit -C origin/main first && > git -C origin/main submodule add ../sub && > git -C origin/main commit -m "add sub" && > - test_commit -C origin/sub "file1-updated" file1 file1updated && > + test_commit -C origin/sub "file1 updated" file1 file1updated file1updated && > @@ > - grep "file1-updated" out > + grep "file1 updated" out > ' > > +test_expect_success 'checkout --recurse-submodules uses $GIT_DIR for submodules in a linked worktree' ' > + git -C main worktree add "$base_path/checkout-recurse" --detach && > + git -C checkout-recurse submodule update --init && > -+ cat checkout-recurse/sub/.git > expect-gitfile && > -+ git -C main/sub rev-parse HEAD > expect-head-main && > ++ echo "gitdir: ../../main/.git/worktrees/checkout-recurse/modules/sub" >expect-gitfile && > ++ cat checkout-recurse/sub/.git >actual-gitfile && > ++ test_cmp expect-gitfile actual-gitfile && > ++ git -C main/sub rev-parse HEAD >expect-head-main && > + git -C checkout-recurse checkout --recurse-submodules HEAD~1 && > -+ cat checkout-recurse/sub/.git > actual-gitfile && > -+ git -C main/sub rev-parse HEAD > actual-head-main && > ++ cat checkout-recurse/sub/.git >actual-gitfile && > ++ git -C main/sub rev-parse HEAD >actual-head-main && > + test_cmp expect-gitfile actual-gitfile && > + test_cmp expect-head-main actual-head-main > +' > + > +test_expect_success 'core.worktree is removed in $GIT_DIR/modules/<name>/config, not in $GIT_COMMON_DIR/modules/<name>/config' ' > -+ git -C main/sub config --get core.worktree > expect && > ++ echo "../../../sub" >expect-main && > ++ git -C main/sub config --get core.worktree >actual-main && > ++ test_cmp expect-main actual-main && > ++ echo "../../../../../../checkout-recurse/sub" >expect-linked && > ++ git -C checkout-recurse/sub config --get core.worktree >actual-linked && > ++ test_cmp expect-linked actual-linked && > + git -C checkout-recurse checkout --recurse-submodules first && > -+ test_might_fail git -C main/.git/worktrees/checkout-recurse/modules/sub config --get core.worktree > linked-config && > ++ test_expect_code 1 git -C main/.git/worktrees/checkout-recurse/modules/sub config --get core.worktree >linked-config && > + test_must_be_empty linked-config && > -+ test_might_fail git -C main/sub config --get core.worktree > actual && > -+ test_cmp expect actual > ++ git -C main/sub config --get core.worktree >actual-main && > ++ test_cmp expect-main actual-main > ++' > ++ > ++test_expect_success 'unsetting core.worktree does not prevent running commands directly against the submodule repository' ' > ++ git -C main/.git/worktrees/checkout-recurse/modules/sub log > +' > + > test_done > > -- > gitgitgadget
