threads / patch / 45458

patcht3600: rename test to describe its functionality

Subject: [PATCH] t3600: rename test to describe its functionality

## tl;dr

4 messages between Mar 21, 2017 and Mar 22, 2017. Diffs are folded; open one to read it.

replies: 3people: 2as markdown or json

Stefan Beller· Mar 21, 2017, 21:08 UTC · lore

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 <sbeller@google.com>
---
 t/t3600-rm.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to t/t3600-rm.sh +1 −1

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· Mar 22, 2017, 01:00 UTC · re: Stefan Beller · lore

Re: [PATCH] t3600: rename test to describe its functionality

Stefan Beller wrote:

Show 19 quoted lines

> 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 <sbeller@google.com>
> ---
>  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 <jrnieder@gmail.com>

Show changes to diff +1 −1

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· Mar 22, 2017, 16:56 UTC · re: Jonathan Nieder · lore

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 <sbeller@google.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
---
 t/t3600-rm.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to t/t3600-rm.sh +1 −1

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· Mar 22, 2017, 18:22 UTC · re: Stefan Beller · lore

Re: [PATCH] t3600: rename test to describe its functionality

Stefan Beller wrote:

Show 6 quoted lines

> 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 <sbeller@google.com>
> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>

Yup.  Thanks for taking care of it.

Jonathan