From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Mar 2017 17:59:28 +0000 (-0700)
Subject: Merge branch 'sb/t3600-rephrase'
X-Git-Tag: v2.13.0-rc0~63
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/b43942b33360414cbdd43f428a2acfc9cd9b86ee?hp=844768a29864cac01d55463a8858457f4908d91e

Merge branch 'sb/t3600-rephrase'

A test retitling.

* sb/t3600-rephrase:
t3600: rename test to describe its functionality
---

diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index 5aa6db584c..3c63455729 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 submodule's nested .git directory" '
 	git reset --hard &&
 	git submodule update --recursive &&
 	(cd submod/subsubmod &&