Stefan Beller wrote: > This was an oversight in 55856a35b2 (rm: absorb a submodules git dir > before deletion, 2016-12-27), as the body of the test changed without > adapting the test subject. > > Signed-off-by: Stefan Beller <[email protected]> > --- > t/t3600-rm.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh > index 5aa6db584c..1f87781e94 100755 > --- a/t/t3600-rm.sh > +++ b/t/t3600-rm.sh > @@ -658,7 +658,7 @@ test_expect_success 'rm of a populated nested submodule > with nested untracked fi > test_cmp expect actual > ' > > -test_expect_success 'rm of a populated nested submodule with a nested .git > directory fails even when forced' ' > +test_expect_success 'rm of a populated nested submodule with a nested .git > directory absorbs the nested git dir' '
This title is getting long. How about something like the following for squashing in? With or without that change, Reviewed-by: Jonathan Nieder <[email protected]> diff --git i/t/t3600-rm.sh w/t/t3600-rm.sh index 1f87781e94..3c63455729 100755 --- i/t/t3600-rm.sh +++ w/t/t3600-rm.sh @@ -658,7 +658,7 @@ test_expect_success 'rm of a populated nested submodule with nested untracked fi test_cmp expect actual ' -test_expect_success 'rm of a populated nested submodule with a nested .git directory absorbs the nested git dir' ' +test_expect_success "rm absorbs submodule's nested .git directory" ' git reset --hard && git submodule update --recursive && (cd submod/subsubmod &&
