Skip to content

Commit 42063f9

Browse files
Thomas Rastgitster
authored andcommitted
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 <[email protected]> Reviewed-by: Jonathan Nieder <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 5addd1c commit 42063f9

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

builtin/apply.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3847,7 +3847,7 @@ static void add_index_file(const char *path, unsigned mode, void *buf, unsigned
38473847
const char *s = buf;
38483848

38493849
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);
38513851
} else {
38523852
if (!cached) {
38533853
if (lstat(path, &st) < 0)

entry.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,9 @@ static int write_entry(struct cache_entry *ce, char *path, const struct checkout
199199
break;
200200
case S_IFGITLINK:
201201
if (to_tempfile)
202-
return error("cannot create temporary subproject %s", path);
202+
return error("cannot create temporary submodule %s", path);
203203
if (mkdir(path, 0777) < 0)
204-
return error("cannot create subproject directory %s", path);
204+
return error("cannot create submodule directory %s", path);
205205
break;
206206
default:
207207
return error("unknown file mode for %s in index", path);

0 commit comments

Comments
 (0)