diff options
| author | Thomas Rast <trast@inf.ethz.ch> | 2013-07-18 14:26:55 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-18 10:56:06 -0700 |
| commit | 42063f95a0f285382458f357bd256df252000ef1 (patch) | |
| tree | 141d4af9f1c969f451d86a6aa3615e0ad4ed9502 /builtin/apply.c | |
| parent | 5addd1c7531cc644787cd562a3c22a3b714c7d77 (diff) | |
| download | git-42063f95a0f285382458f357bd256df252000ef1.tar.gz git-42063f95a0f285382458f357bd256df252000ef1.tar.xz | |
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>
Diffstat (limited to 'builtin/apply.c')
| -rw-r--r-- | builtin/apply.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/apply.c b/builtin/apply.c index 3979f8bf3..14c91bf35 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) |