apply, entry: speak of submodules instead of subprojects
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 format. Let's at least change the error messages to consistently call them "submodule". Signed-off-by: Thomas Rast <trast@inf.ethz.ch> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Thomas Rast committed
Jul 18, 2013 at 14:26 UTC
42063f95a0f285382458f357bd256df252000ef1
2 files changed
+3
-3
builtin/apply.c
+1
-1
@@ -3847,7 +3847,7 @@ static void add_index_file(const char *path, unsigned mode, void *buf, unsigned
3847
const char *s = buf;
3848
3849
if (get_sha1_hex(s + strlen("Subproject commit "), ce->sha1))
3850
- die(_("corrupt patch for subproject %s"), path);
3850
+ die(_("corrupt patch for submodule %s"), path);
3851
} else {
3852
if (!cached) {
3853
if (lstat(path, &st) < 0)
entry.c
+2
-2
@@ -199,9 +199,9 @@ static int write_entry(struct cache_entry *ce, char *path, const struct checkout
199
break;
200
case S_IFGITLINK:
201
if (to_tempfile)
202
- return error("cannot create temporary subproject %s", path);
202
+ return error("cannot create temporary submodule %s", path);
203
if (mkdir(path, 0777) < 0)
204
- return error("cannot create subproject directory %s", path);
204
+ return error("cannot create submodule directory %s", path);
205
break;
206
default:
207
return error("unknown file mode for %s in index", path);