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>

diff --git a/t/t7408-submodule-reference.sh b/t/t7408-submodule-reference.sh
index a45fadc58e047aa0e6637b9ef5dce86a28ddc4f1..b770b2f04d56336f92b9394b4a2ce22a241480c4 100755 (executable)
--- a/t/t7408-submodule-reference.sh
+++ b/t/t7408-submodule-reference.sh
@@ -28,7 +28,7 @@ git prune'
 
 cd "$base_dir"
 
 
 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 &&
 'test_create_repo super && cd super &&
 echo file > file &&
 git add file &&


@@ -55,7 +55,7 @@ diff expected current'
 
 cd "$base_dir"
 
 
 cd "$base_dir"
 

-test_expect_success 'cloning supermodule' \
+test_expect_success 'cloning superproject' \

 'git clone super super-clone'
 
 cd "$base_dir"
 'git clone super super-clone'
 
 cd "$base_dir"

diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 7da0e8da7bfd68c0ac4e0b987664c7340078eb99..2aa1824a940aa955fab408995d2479e50bd42b96 100755 (executable)
--- 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 \
 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 &&
        '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 36523da22aedba160c5a29f95bf339f05dfc6feb..f0ac24b9f5306d6b805cc5a578cc7110f2cc09f3 100644 (file)
--- 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
                        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.
                 * index.  This needs to be tightened later for
                 * submodules that are marked to be automatically
                 * checked out.