aboutsummaryrefslogtreecommitdiff
path: root/unpack-trees.c
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 /unpack-trees.c
parent27ccd8d1a3ccb539d1d97302e1f500b6d20eb781 (diff)
downloadgit-cb8ad289c6b3f774e6e4431a08eb585eadbb8dad.tar.gz
git-cb8ad289c6b3f774e6e4431a08eb585eadbb8dad.tar.xz
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>
Diffstat (limited to 'unpack-trees.c')
-rw-r--r--unpack-trees.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c
index 36523da22..f0ac24b9f 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.