Consistently use "superproject" instead of "supermodule"
We fairly consistently say "superproject" and never "supermodule" these days. But there are seven occurrences of "supermodule" left in the current work tree. Three appear in Release Notes for 1.5.3 and 1.7.7, three in test names and one in a C-code comment. Replace all occurrences of "supermodule" outside of the Release Notes (which shouldn't be changed after the fact) with "superproject" for consistency. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jens Lehmann committed
May 20, 2012 at 15:28 UTC
cb8ad289c6b3f774e6e4431a08eb585eadbb8dad
3 files changed
+4
-4
t/t7408-submodule-reference.sh
+2
-2
@@ -28,7 +28,7 @@ git prune'
28
29
cd "$base_dir"
30
31
-test_expect_success 'preparing supermodule' \
31
+test_expect_success 'preparing superproject' \
32
'test_create_repo super && cd super &&
33
echo file > file &&
34
git add file &&
@@ -55,7 +55,7 @@ diff expected current'
55
56
cd "$base_dir"
57
58
-test_expect_success 'cloning supermodule' \
58
+test_expect_success 'cloning superproject' \
59
'git clone super super-clone'
60
61
cd "$base_dir"
t/t9300-fast-import.sh
+1
-1
@@ -1657,7 +1657,7 @@ M 160000 :6 sub
1657
INPUT_END
1658
1659
test_expect_success \
1660
- 'P: supermodule & submodule mix' \
1660
+ 'P: superproject & submodule mix' \
1661
'git fast-import <input &&
1662
git checkout subuse1 &&
1663
rm -rf sub && mkdir sub && (cd sub &&
unpack-trees.c
+1
-1
@@ -1209,7 +1209,7 @@ static int verify_uptodate_1(struct cache_entry *ce,
1209
return 0;
1210
/*
1211
* NEEDSWORK: the current default policy is to allow
1212
- * submodule to be out of sync wrt the supermodule
1212
+ * submodule to be out of sync wrt the superproject
1213
* index. This needs to be tightened later for
1214
* submodules that are marked to be automatically
1215
* checked out.