Merge branch 'sb/t3600-rephrase' into maint

gitster · gitster · commit 88fb4aa23a58 · 2017-03-28T13:52:29.000-07:00
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
@@ -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 &&

Original file line number	Diff line number	Diff line change
`@@ -658,7 +658,7 @@ test_expect_success 'rm of a populated nested submodule with nested untracked fi`
`658`	`658`	`test_cmp expect actual`
`659`	`659`	`'`
`660`	`660`
`661`		`-test_expect_success 'rm of a populated nested submodule with a nested .git directory fails even when forced' '`
	`661`	`+test_expect_success "rm absorbs submodule's nested .git directory" '`
`662`	`662`	`git reset --hard &&`
`663`	`663`	`git submodule update --recursive &&`
`664`	`664`	`(cd submod/subsubmod &&`