diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-09-25 15:24:08 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-25 15:24:08 +0900 |
| commit | 450b9086484775c99d512c5a6d68fba232183579 (patch) | |
| tree | 27df88ef2d61b2cee486b70cea342049caf752e6 | |
| parent | Merge branch 'bw/git-clang-format' (diff) | |
| parent | add test for bug in git-mv for recursive submodules (diff) | |
| download | tgif-450b9086484775c99d512c5a6d68fba232183579.tar.xz | |
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
| -rwxr-xr-x | t/t7001-mv.sh | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh index e365d1ff77..cbc5fb37fe 100755 --- a/t/t7001-mv.sh +++ b/t/t7001-mv.sh @@ -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 |