mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'hv/mv-nested-submodules-test'
A test to demonstrate "git mv" failing to adjust nested submodules has been added. * hv/mv-nested-submodules-test: add test for bug in git-mv for recursive submodules
This commit is contained in:
commit
450b908648
|
@ -491,4 +491,29 @@ test_expect_success 'moving a submodule in nested directories' '
|
|||
test_cmp actual expect
|
||||
'
|
||||
|
||||
test_expect_failure 'moving nested submodules' '
|
||||
git commit -am "cleanup commit" &&
|
||||
mkdir sub_nested_nested &&
|
||||
(cd sub_nested_nested &&
|
||||
touch nested_level2 &&
|
||||
git init &&
|
||||
git add . &&
|
||||
git commit -m "nested level 2"
|
||||
) &&
|
||||
mkdir sub_nested &&
|
||||
(cd sub_nested &&
|
||||
touch nested_level1 &&
|
||||
git init &&
|
||||
git add . &&
|
||||
git commit -m "nested level 1"
|
||||
git submodule add ../sub_nested_nested &&
|
||||
git commit -m "add nested level 2"
|
||||
) &&
|
||||
git submodule add ./sub_nested nested_move &&
|
||||
git commit -m "add nested_move" &&
|
||||
git submodule update --init --recursive &&
|
||||
git mv nested_move sub_nested_moved &&
|
||||
git status
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
Loading…
Reference in a new issue