diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-03-27 17:59:28 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-27 17:59:28 (GMT) |
| commit | b43942b33360414cbdd43f428a2acfc9cd9b86ee (patch) | |
| tree | fecfd49fd08ebdbcc1a3d65af04151cc5341db63 | |
| parent | 844768a29864cac01d55463a8858457f4908d91e (diff) | |
| parent | 70471ed9bb204b3a6bdbcc466393565c3ee25bb8 (diff) | |
| download | git-b43942b33360414cbdd43f428a2acfc9cd9b86ee.zip git-b43942b33360414cbdd43f428a2acfc9cd9b86ee.tar.gz git-b43942b33360414cbdd43f428a2acfc9cd9b86ee.tar.bz2 | |
Merge branch 'sb/t3600-rephrase'
A test retitling.
* sb/t3600-rephrase:
t3600: rename test to describe its functionality
| -rwxr-xr-x | t/t3600-rm.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh index 5aa6db5..3c63455 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 && |