2014-11-30 09:24:59 +01:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
2020-01-21 16:01:14 +01:00
|
|
|
test_description='Combination of submodules and multiple worktrees'
|
2014-11-30 09:24:59 +01:00
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
|
|
base_path=$(pwd -P)
|
|
|
|
|
|
2020-01-21 16:01:15 +01:00
|
|
|
test_expect_success 'setup: create origin repos' '
|
|
|
|
|
git init origin/sub &&
|
|
|
|
|
test_commit -C origin/sub file1 &&
|
|
|
|
|
git init origin/main &&
|
submodule.c: use get_git_dir() instead of get_git_common_dir()
Ever since df56607dff (git-common-dir: make "modules/"
per-working-directory directory, 2014-11-30), submodules in linked worktrees
are cloned to $GIT_DIR/modules, i.e. $GIT_COMMON_DIR/worktrees/<name>/modules.
However, this convention was not followed when the worktree updater commands
checkout, reset and read-tree learned to recurse into submodules. Specifically,
submodule.c::submodule_move_head, introduced in 6e3c1595c6 (update submodules:
add submodule_move_head, 2017-03-14) and submodule.c::submodule_unset_core_worktree,
(re)introduced in 898c2e65b7 (submodule: unset core.worktree if no working tree
is present, 2018-12-14) use get_git_common_dir() instead of get_git_dir()
to get the path of the submodule repository.
This means that, for example, 'git checkout --recurse-submodules <branch>'
in a linked worktree will correctly checkout <branch>, detach the submodule's HEAD
at the commit recorded in <branch> and update the submodule working tree, but the
submodule HEAD that will be moved is the one in $GIT_COMMON_DIR/modules/<name>/,
i.e. the submodule repository of the main superproject working tree.
It will also rewrite the gitfile in the submodule working tree of the linked worktree
to point to $GIT_COMMON_DIR/modules/<name>/.
This leads to an incorrect (and confusing!) state in the submodule working tree
of the main superproject worktree.
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.
Fix this by constructing the path to the submodule repository using get_git_dir()
in both submodule_move_head and submodule_unset_core_worktree.
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-01-21 16:01:17 +01:00
|
|
|
test_commit -C origin/main first &&
|
2020-01-21 16:01:15 +01:00
|
|
|
git -C origin/main submodule add ../sub &&
|
|
|
|
|
git -C origin/main commit -m "add sub" &&
|
|
|
|
|
test_commit -C origin/sub "file1 updated" file1 file1updated file1updated &&
|
2018-08-16 04:30:54 +02:00
|
|
|
git -C origin/main/sub pull &&
|
2020-01-21 16:01:15 +01:00
|
|
|
git -C origin/main add sub &&
|
|
|
|
|
git -C origin/main commit -m "sub updated"
|
2018-08-16 04:30:54 +02:00
|
|
|
'
|
|
|
|
|
|
2020-01-21 16:01:16 +01:00
|
|
|
test_expect_success 'setup: clone superproject to create main worktree' '
|
|
|
|
|
git clone --recursive "$base_path/origin/main" main
|
2018-08-16 04:30:54 +02:00
|
|
|
'
|
2014-11-30 09:24:59 +01:00
|
|
|
|
|
|
|
|
rev1_hash_main=$(git --git-dir=origin/main/.git show --pretty=format:%h -q "HEAD~1")
|
|
|
|
|
rev1_hash_sub=$(git --git-dir=origin/sub/.git show --pretty=format:%h -q "HEAD~1")
|
|
|
|
|
|
2020-01-21 16:01:16 +01:00
|
|
|
test_expect_success 'add superproject worktree' '
|
|
|
|
|
git -C main worktree add "$base_path/worktree" "$rev1_hash_main"
|
2018-08-16 04:30:54 +02:00
|
|
|
'
|
2014-11-30 09:24:59 +01:00
|
|
|
|
2020-01-21 16:01:16 +01:00
|
|
|
test_expect_failure 'submodule is checked out just after worktree add' '
|
|
|
|
|
git -C worktree diff --submodule master"^!" >out &&
|
2018-08-16 04:30:54 +02:00
|
|
|
grep "file1 updated" out
|
|
|
|
|
'
|
2014-11-30 09:24:59 +01:00
|
|
|
|
2020-01-21 16:01:16 +01:00
|
|
|
test_expect_success 'add superproject worktree and initialize submodules' '
|
|
|
|
|
git -C main worktree add "$base_path/worktree-submodule-update" "$rev1_hash_main" &&
|
|
|
|
|
git -C worktree-submodule-update submodule update
|
2018-08-16 04:30:54 +02:00
|
|
|
'
|
2014-11-30 09:24:59 +01:00
|
|
|
|
2020-01-21 16:01:16 +01:00
|
|
|
test_expect_success 'submodule is checked out just after submodule update in linked worktree' '
|
|
|
|
|
git -C worktree-submodule-update diff --submodule master"^!" >out &&
|
2018-08-16 04:30:54 +02:00
|
|
|
grep "file1 updated" out
|
|
|
|
|
'
|
2014-11-30 09:24:59 +01:00
|
|
|
|
2020-01-21 16:01:16 +01:00
|
|
|
test_expect_success 'add superproject worktree and manually add submodule worktree' '
|
|
|
|
|
git -C main worktree add "$base_path/linked_submodule" "$rev1_hash_main" &&
|
|
|
|
|
git -C main/sub worktree add "$base_path/linked_submodule/sub" "$rev1_hash_sub"
|
2018-08-16 04:30:54 +02:00
|
|
|
'
|
2015-09-14 00:17:42 +02:00
|
|
|
|
2020-01-21 16:01:16 +01:00
|
|
|
test_expect_success 'submodule is checked out after manually adding submodule worktree' '
|
|
|
|
|
git -C linked_submodule diff --submodule master"^!" >out &&
|
2018-08-16 04:30:54 +02:00
|
|
|
grep "file1 updated" out
|
|
|
|
|
'
|
2015-09-14 00:17:42 +02:00
|
|
|
|
submodule.c: use get_git_dir() instead of get_git_common_dir()
Ever since df56607dff (git-common-dir: make "modules/"
per-working-directory directory, 2014-11-30), submodules in linked worktrees
are cloned to $GIT_DIR/modules, i.e. $GIT_COMMON_DIR/worktrees/<name>/modules.
However, this convention was not followed when the worktree updater commands
checkout, reset and read-tree learned to recurse into submodules. Specifically,
submodule.c::submodule_move_head, introduced in 6e3c1595c6 (update submodules:
add submodule_move_head, 2017-03-14) and submodule.c::submodule_unset_core_worktree,
(re)introduced in 898c2e65b7 (submodule: unset core.worktree if no working tree
is present, 2018-12-14) use get_git_common_dir() instead of get_git_dir()
to get the path of the submodule repository.
This means that, for example, 'git checkout --recurse-submodules <branch>'
in a linked worktree will correctly checkout <branch>, detach the submodule's HEAD
at the commit recorded in <branch> and update the submodule working tree, but the
submodule HEAD that will be moved is the one in $GIT_COMMON_DIR/modules/<name>/,
i.e. the submodule repository of the main superproject working tree.
It will also rewrite the gitfile in the submodule working tree of the linked worktree
to point to $GIT_COMMON_DIR/modules/<name>/.
This leads to an incorrect (and confusing!) state in the submodule working tree
of the main superproject worktree.
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.
Fix this by constructing the path to the submodule repository using get_git_dir()
in both submodule_move_head and submodule_unset_core_worktree.
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-01-21 16:01:17 +01:00
|
|
|
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 &&
|
|
|
|
|
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 &&
|
|
|
|
|
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' '
|
|
|
|
|
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_expect_code 1 git -C main/.git/worktrees/checkout-recurse/modules/sub config --get core.worktree >linked-config &&
|
|
|
|
|
test_must_be_empty linked-config &&
|
|
|
|
|
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
|
|
|
|
|
'
|
|
|
|
|
|
2014-11-30 09:24:59 +01:00
|
|
|
test_done
|