mirror of
https://github.com/git/git.git
synced 2024-10-31 14:27:54 +01:00
df56607dff
Each working directory of main repository has its own working directory of submodule, and in most cases they should be checked out to different revisions. So they should be separated. It looks logical to make submodule instances in different working directories to reuse the submodule directory in the common dir of the main repository, and probably this is how "checkout --to" should initialize them called on the main repository, but they also should work fine being completely separated clones. Testfile t7410-submodule-checkout-to.sh demostrates the behavior. Signed-off-by: Max Kirillov <max@max630.net> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
50 lines
1.7 KiB
Bash
Executable file
50 lines
1.7 KiB
Bash
Executable file
#!/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" ) &&
|
|
( cd origin/main/sub && git pull ) &&
|
|
( cd origin/main &&
|
|
git add sub &&
|
|
git commit -m "sub updated" )'
|
|
|
|
test_expect_success 'setup: clone' \
|
|
'mkdir clone && ( cd clone &&
|
|
git 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 &&
|
|
(cd clone/main &&
|
|
git checkout --to "$base_path/default_checkout/main" "$rev1_hash_main")'
|
|
|
|
test_expect_failure 'can see submodule diffs just after checkout' \
|
|
'(cd default_checkout/main && git diff --submodule master"^!" | grep "file1 updated")'
|
|
|
|
test_expect_success 'checkout main and initialize independed clones' \
|
|
'mkdir fully_cloned_submodule &&
|
|
(cd clone/main &&
|
|
git checkout --to "$base_path/fully_cloned_submodule/main" "$rev1_hash_main") &&
|
|
(cd fully_cloned_submodule/main && git submodule update)'
|
|
|
|
test_expect_success 'can see submodule diffs after independed cloning' \
|
|
'(cd fully_cloned_submodule/main && git diff --submodule master"^!" | grep "file1 updated")'
|
|
|
|
test_done
|