diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-03-28 13:52:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-28 13:52:29 -0700 |
| commit | 88fb4aa23a5840f46cb20e1c66420de9796da6a2 (patch) | |
| tree | cc8679b8e7c3b87b895e871547a54e5899269624 | |
| parent | 04b4f7d579056cedaae2de0a019e5993b4d9c2d0 (diff) | |
| parent | 70471ed9bb204b3a6bdbcc466393565c3ee25bb8 (diff) | |
| download | git-88fb4aa23a5840f46cb20e1c66420de9796da6a2.tar.gz | |
Merge branch 'sb/t3600-rephrase' into maint
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 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 && |