summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Lehmann <Jens.Lehmann@web.de>2012-05-20 15:28:26 +0200
committerJunio C Hamano <gitster@pobox.com>2012-05-20 14:58:38 -0700
commitcb8ad289c6b3f774e6e4431a08eb585eadbb8dad (patch)
tree3c63f91415fe59f13494b3fbb30c5679b0073155
parent27ccd8d1a3ccb539d1d97302e1f500b6d20eb781 (diff)
downloadgit-cb8ad289c6b3f774e6e4431a08eb585eadbb8dad.tar.gz
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>
-rwxr-xr-xt/t7408-submodule-reference.sh4
-rwxr-xr-xt/t9300-fast-import.sh2
-rw-r--r--unpack-trees.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/t/t7408-submodule-reference.sh b/t/t7408-submodule-reference.sh
index a45fadc58e..b770b2f04d 100755
--- a/t/t7408-submodule-reference.sh
+++ b/t/t7408-submodule-reference.sh
@@ -28,7 +28,7 @@ git prune'
cd "$base_dir"
-test_expect_success 'preparing supermodule' \
+test_expect_success 'preparing superproject' \
'test_create_repo super && cd super &&
echo file > file &&
git add file &&
@@ -55,7 +55,7 @@ diff expected current'
cd "$base_dir"
-test_expect_success 'cloning supermodule' \
+test_expect_success 'cloning superproject' \
'git clone super super-clone'
cd "$base_dir"
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 7da0e8da7b..2aa1824a94 100755
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -1657,7 +1657,7 @@ M 160000 :6 sub
INPUT_END
test_expect_success \
- 'P: supermodule & submodule mix' \
+ 'P: superproject & submodule mix' \
'git fast-import <input &&
git checkout subuse1 &&
rm -rf sub && mkdir sub && (cd sub &&
diff --git a/unpack-trees.c b/unpack-trees.c
index 36523da22a..f0ac24b9f5 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1209,7 +1209,7 @@ static int verify_uptodate_1(struct cache_entry *ce,
return 0;
/*
* NEEDSWORK: the current default policy is to allow
- * submodule to be out of sync wrt the supermodule
+ * submodule to be out of sync wrt the superproject
* index. This needs to be tightened later for
* submodules that are marked to be automatically
* checked out.