Skip to content
This repository was archived by the owner on Nov 9, 2017. It is now read-only.

Commit cb8ad28

Browse files
jlehmanngitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 27ccd8d commit cb8ad28

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

t/t7408-submodule-reference.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ git prune'
2828

2929
cd "$base_dir"
3030

31-
test_expect_success 'preparing supermodule' \
31+
test_expect_success 'preparing superproject' \
3232
'test_create_repo super && cd super &&
3333
echo file > file &&
3434
git add file &&
@@ -55,7 +55,7 @@ diff expected current'
5555

5656
cd "$base_dir"
5757

58-
test_expect_success 'cloning supermodule' \
58+
test_expect_success 'cloning superproject' \
5959
'git clone super super-clone'
6060

6161
cd "$base_dir"

t/t9300-fast-import.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1657,7 +1657,7 @@ M 160000 :6 sub
16571657
INPUT_END
16581658

16591659
test_expect_success \
1660-
'P: supermodule & submodule mix' \
1660+
'P: superproject & submodule mix' \
16611661
'git fast-import <input &&
16621662
git checkout subuse1 &&
16631663
rm -rf sub && mkdir sub && (cd sub &&

unpack-trees.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1209,7 +1209,7 @@ static int verify_uptodate_1(struct cache_entry *ce,
12091209
return 0;
12101210
/*
12111211
* 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
12131213
* index. This needs to be tightened later for
12141214
* submodules that are marked to be automatically
12151215
* checked out.

0 commit comments

Comments
 (0)