There are only four (with some generous rounding) instances in the
current source code where we speak of "subproject" instead of
"submodule".  They are as follows:

* one error message in git-apply and two in entry.c

* the patch format for submodule changes

The latter was introduced in 0478675 (Expose subprojects as special
files to "git diff" machinery, 2007-04-15), apparently before the
terminology was settled.  We can of course not change the patch

Let's at least change the error messages to consistently call them

Signed-off-by: Thomas Rast <>
Reviewed-by: Jonathan Nieder <>
 builtin/apply.c | 2 +-
 entry.c         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/builtin/apply.c b/builtin/apply.c
index 0e9b631..f1d4cc9 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -3847,7 +3847,7 @@ static void add_index_file(const char *path, unsigned 
mode, void *buf, unsigned
                const char *s = buf;
                if (get_sha1_hex(s + strlen("Subproject commit "), ce->sha1))
-                       die(_("corrupt patch for subproject %s"), path);
+                       die(_("corrupt patch for submodule %s"), path);
        } else {
                if (!cached) {
                        if (lstat(path, &st) < 0)
diff --git a/entry.c b/entry.c
index d7c131d..6af4b6a 100644
--- a/entry.c
+++ b/entry.c
@@ -199,9 +199,9 @@ static int write_entry(struct cache_entry *ce, char *path, 
const struct checkout
        case S_IFGITLINK:
                if (to_tempfile)
-                       return error("cannot create temporary subproject %s", 
+                       return error("cannot create temporary submodule %s", 
                if (mkdir(path, 0777) < 0)
-                       return error("cannot create subproject directory %s", 
+                       return error("cannot create submodule directory %s", 
                return error("unknown file mode for %s in index", path);

To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to
More majordomo info at

Reply via email to