Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'sb/t3600-rephrase'
author
Junio C Hamano
<gitster@pobox.com>
Mon, 27 Mar 2017 17:59:28 +0000
(10:59 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 27 Mar 2017 17:59:28 +0000
(10:59 -0700)
A test retitling.
* sb/t3600-rephrase:
t3600: rename test to describe its functionality
t/t3600-rm.sh
patch
|
blob
|
history
raw
(from parent 1:
844768a
)
diff --git
a/t/t3600-rm.sh
b/t/t3600-rm.sh
index 5aa6db584cd0dbddf6060eeb46f4c1c9836bc935..3c63455729c9bad8aae1210172225e5fb1aab229 100755
(executable)
--- 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 &&