kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
Browse Source

Merge branch 'pb/recurse-submodule-in-worktree-fix' into maint 

The "--recurse-submodules" option of various subcommands did not
work well when run in an alternate worktree, which has been
corrected.

* pb/recurse-submodule-in-worktree-fix:
  submodule.c: use get_git_dir() instead of get_git_common_dir()
  t2405: clarify test descriptions and simplify test
  t2405: use git -C and test_commit -C instead of subshells
  t7410: rename to t2405-worktree-submodule.sh
maint
Junio C Hamano 5 years ago
parent
758d0773ba a9472afb63
commit
dae477777e
3 changed files with 93 additions and 80 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      submodule.c
  2. 90
      t/t2405-worktree-submodule.sh
  3. 77
      t/t7410-submodule-checkout-to.sh

6
submodule.c
Unescape View File

@ -1811,7 +1811,7 @@ out: @@ -1811,7 +1811,7 @@ out:
void submodule_unset_core_worktree(const struct submodule *sub)
{
char *config_path = xstrfmt("%s/modules/%s/config",
get_git_common_dir(), sub->name);
get_git_dir(), sub->name);

if (git_config_set_in_file_gently(config_path, "core.worktree", NULL))
warning(_("Could not unset core.worktree setting in submodule '%s'"),
@ -1914,7 +1914,7 @@ int submodule_move_head(const char *path, @@ -1914,7 +1914,7 @@ int submodule_move_head(const char *path,
ABSORB_GITDIR_RECURSE_SUBMODULES);
} else {
char *gitdir = xstrfmt("%s/modules/%s",
get_git_common_dir(), sub->name);
get_git_dir(), sub->name);
connect_work_tree_and_git_dir(path, gitdir, 0);
free(gitdir);

@ -1924,7 +1924,7 @@ int submodule_move_head(const char *path, @@ -1924,7 +1924,7 @@ int submodule_move_head(const char *path,

if (old_head && (flags & SUBMODULE_MOVE_HEAD_FORCE)) {
char *gitdir = xstrfmt("%s/modules/%s",
get_git_common_dir(), sub->name);
get_git_dir(), sub->name);
connect_work_tree_and_git_dir(path, gitdir, 1);
free(gitdir);
}

90
t/t2405-worktree-submodule.sh
Unescape View File

@ -0,0 +1,90 @@ @@ -0,0 +1,90 @@
#!/bin/sh

test_description='Combination of submodules and multiple worktrees'

. ./test-lib.sh

base_path=$(pwd -P)

test_expect_success 'setup: create origin repos' '
git init origin/sub &&
test_commit -C origin/sub file1 &&
git init origin/main &&
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 file1updated &&
git -C origin/main/sub pull &&
git -C origin/main add sub &&
git -C origin/main commit -m "sub updated"
'

test_expect_success 'setup: clone superproject to create main worktree' '
git clone --recursive "$base_path/origin/main" main
'

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")

test_expect_success 'add superproject worktree' '
git -C main worktree add "$base_path/worktree" "$rev1_hash_main"
'

test_expect_failure 'submodule is checked out just after worktree add' '
git -C worktree diff --submodule master"^!" >out &&
grep "file1 updated" out
'

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
'

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
'

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"
'

test_expect_success 'submodule is checked out after manually adding submodule worktree' '
git -C linked_submodule diff --submodule master"^!" >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 &&
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
'

test_done

77
t/t7410-submodule-checkout-to.sh
Unescape View File

@ -1,77 +0,0 @@ @@ -1,77 +0,0 @@
#!/bin/sh

test_description='Combination of submodules and multiple workdirs'

. ./test-lib.sh

base_path=$(pwd -P)

test_expect_success 'setup: make origin' '
mkdir -p origin/sub &&
(
cd origin/sub && git init &&
echo file1 >file1 &&
git add file1 &&
git commit -m file1
) &&
mkdir -p origin/main &&
(
cd origin/main && git init &&
git submodule add ../sub &&
git commit -m "add sub"
) &&
(
cd origin/sub &&
echo file1updated >file1 &&
git add file1 &&
git commit -m "file1 updated"
) &&
git -C origin/main/sub pull &&
(
cd origin/main &&
git add sub &&
git commit -m "sub updated"
)
'

test_expect_success 'setup: clone' '
mkdir clone &&
git -C clone clone --recursive "$base_path/origin/main"
'

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")

test_expect_success 'checkout main' '
mkdir default_checkout &&
git -C clone/main worktree add "$base_path/default_checkout/main" "$rev1_hash_main"
'

test_expect_failure 'can see submodule diffs just after checkout' '
git -C default_checkout/main diff --submodule master"^!" >out &&
grep "file1 updated" out
'

test_expect_success 'checkout main and initialize independent clones' '
mkdir fully_cloned_submodule &&
git -C clone/main worktree add "$base_path/fully_cloned_submodule/main" "$rev1_hash_main" &&
git -C fully_cloned_submodule/main submodule update
'

test_expect_success 'can see submodule diffs after independent cloning' '
git -C fully_cloned_submodule/main diff --submodule master"^!" >out &&
grep "file1 updated" out
'

test_expect_success 'checkout sub manually' '
mkdir linked_submodule &&
git -C clone/main worktree add "$base_path/linked_submodule/main" "$rev1_hash_main" &&
git -C clone/main/sub worktree add "$base_path/linked_submodule/main/sub" "$rev1_hash_sub"
'

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
'

test_done
Write Preview
Loading…
Cancel
Save