# [PATCH] t3600: rename test to describe its functionality 4 messages from 2017-03-21 to 2017-03-22. Participants: Stefan Beller, Jonathan Nieder. Thread: https://gitlist.dev/t/45458 ## Stefan Beller, 2017-03-21 21:08 Subject: [PATCH] t3600: rename test to describe its functionality Message-ID: <20170321210802.9675-1-sbeller@google.com> URL: https://gitlist.dev/e/20170321210802.9675-1-sbeller%40google.com ``` 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 --- 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' ' git reset --hard && git submodule update --recursive && (cd submod/subsubmod && -- 2.12.1.386.gf8442ebc0a.dirty ``` ## Jonathan Nieder, 2017-03-22 01:00 Subject: Re: [PATCH] t3600: rename test to describe its functionality Message-ID: <20170322010058.GA31294@aiede.mtv.corp.google.com> URL: https://gitlist.dev/e/20170322010058.GA31294%40aiede.mtv.corp.google.com In-Reply-To: <20170321210802.9675-1-sbeller@google.com> ``` 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 > --- > 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 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 && ``` ## Stefan Beller, 2017-03-22 16:56 Subject: [PATCH] t3600: rename test to describe its functionality Message-ID: <20170322165639.21658-1-sbeller@google.com> URL: https://gitlist.dev/e/20170322165639.21658-1-sbeller%40google.com In-Reply-To: <20170322010058.GA31294@aiede.mtv.corp.google.com> ``` 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 Reviewed-by: Jonathan Nieder --- 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..e94da6b5f1 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 absorbs .git directory of nested submodule' ' git reset --hard && git submodule update --recursive && (cd submod/subsubmod && -- 2.12.0.rc1.47.g25804914fa.dirty ``` ## Jonathan Nieder, 2017-03-22 18:22 Subject: Re: [PATCH] t3600: rename test to describe its functionality Message-ID: <20170322182259.GA26108@aiede.mtv.corp.google.com> URL: https://gitlist.dev/e/20170322182259.GA26108%40aiede.mtv.corp.google.com In-Reply-To: <20170322165639.21658-1-sbeller@google.com> ``` 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 > Reviewed-by: Jonathan Nieder Yup. Thanks for taking care of it. Jonathan ```