microsoft
/
git
зеркало из https://github.com/microsoft/git.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge branch 'sb/submodule-cleanup' 

A few preliminary minor clean-ups in the area around submodules.

* sb/submodule-cleanup:
  builtin/submodule--helper: remove stray new line
  t7410: update to new style
This commit is contained in:
Junio C Hamano 2018-08-20 12:41:33 -07:00
Родитель 5a5c5e9565 e6b09b184d
Коммит 85c54ecc5f
2 изменённых файлов: 57 добавлений и 41 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
builtin/submodule--helper.c
Просмотреть файл

@ -1024,7 +1024,6 @@ static void sync_submodule_cb(const struct cache_entry *list_item, void *cb_data
{
struct sync_cb *info = cb_data;
sync_submodule(list_item->name, info->prefix, info->flags);
}
static int module_sync(int argc, const char **argv, const char *prefix)

97
t/t7410-submodule-checkout-to.sh
Просмотреть файл

@ -6,55 +6,72 @@ test_description='Combination of submodules and multiple workdirs'
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: 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 && ( cd clone &&
git clone --recursive "$base_path/origin/main")'
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 &&
(cd clone/main &&
git worktree add "$base_path/default_checkout/main" "$rev1_hash_main")'
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' \
'(cd default_checkout/main && git diff --submodule master"^!" | grep "file1 updated")'
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 independed clones' \
'mkdir fully_cloned_submodule &&
(cd clone/main &&
git worktree add "$base_path/fully_cloned_submodule/main" "$rev1_hash_main") &&
(cd fully_cloned_submodule/main && git submodule update)'
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 independed cloning' \
'(cd fully_cloned_submodule/main && git diff --submodule master"^!" | grep "file1 updated")'
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 &&
(cd clone/main &&
git worktree add "$base_path/linked_submodule/main" "$rev1_hash_main") &&
(cd clone/main/sub &&
git worktree add "$base_path/linked_submodule/main/sub" "$rev1_hash_sub")'
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' \
'(cd linked_submodule/main && git diff --submodule master"^!" | grep "file1 updated")'
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