Skip to content

Commit

Permalink
Merge branch 'hv/mv-nested-submodules-test'
Browse files Browse the repository at this point in the history
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
  • Loading branch information
gitster committed Sep 25, 2017
2 parents a36f631 + c514167 commit 450b908
Showing 1 changed file with 25 additions and 0 deletions.
25 changes: 25 additions & 0 deletions t/t7001-mv.sh
Expand Up @@ -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

0 comments on commit 450b908

Please sign in to comment.