* [PATCH] t3600: rename test to describe its functionality
@ 2017-03-21 21:08 Stefan Beller
2017-03-22 1:00 ` Jonathan Nieder
0 siblings, 1 reply; 4+ messages in thread
From: Stefan Beller @ 2017-03-21 21:08 UTC (permalink / raw)
To: gitster; +Cc: git, Stefan Beller
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' '
git reset --hard &&
git submodule update --recursive &&
(cd submod/subsubmod &&
--
2.12.1.386.gf8442ebc0a.dirty
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] t3600: rename test to describe its functionality
2017-03-21 21:08 [PATCH] t3600: rename test to describe its functionality Stefan Beller
@ 2017-03-22 1:00 ` Jonathan Nieder
2017-03-22 16:56 ` Stefan Beller
0 siblings, 1 reply; 4+ messages in thread
From: Jonathan Nieder @ 2017-03-22 1:00 UTC (permalink / raw)
To: Stefan Beller; +Cc: gitster, git
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 <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>
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 &&
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] t3600: rename test to describe its functionality
2017-03-22 1:00 ` Jonathan Nieder
@ 2017-03-22 16:56 ` Stefan Beller
2017-03-22 18:22 ` Jonathan Nieder
0 siblings, 1 reply; 4+ messages in thread
From: Stefan Beller @ 2017-03-22 16:56 UTC (permalink / raw)
To: gitster, jrnieder; +Cc: git, Stefan Beller
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(-)
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] t3600: rename test to describe its functionality
2017-03-22 16:56 ` Stefan Beller
@ 2017-03-22 18:22 ` Jonathan Nieder
0 siblings, 0 replies; 4+ messages in thread
From: Jonathan Nieder @ 2017-03-22 18:22 UTC (permalink / raw)
To: Stefan Beller; +Cc: gitster, git
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 <sbeller@google.com>
> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Yup. Thanks for taking care of it.
Jonathan
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-03-22 18:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-21 21:08 [PATCH] t3600: rename test to describe its functionality Stefan Beller
2017-03-22 1:00 ` Jonathan Nieder
2017-03-22 16:56 ` Stefan Beller
2017-03-22 18:22 ` Jonathan Nieder
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).