summaryrefslogtreecommitdiff
path: root/entry.c
diff options
context:
space:
mode:
authorThomas Rast <trast@inf.ethz.ch>2013-07-18 12:26:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-07-18 17:56:06 (GMT)
commit42063f95a0f285382458f357bd256df252000ef1 (patch)
tree141d4af9f1c969f451d86a6aa3615e0ad4ed9502 /entry.c
parent5addd1c7531cc644787cd562a3c22a3b714c7d77 (diff)
downloadgit-42063f95a0f285382458f357bd256df252000ef1.zip
git-42063f95a0f285382458f357bd256df252000ef1.tar.gz
git-42063f95a0f285382458f357bd256df252000ef1.tar.bz2
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 'entry.c')
-rw-r--r--entry.c4
1 files changed, 2 insertions, 2 deletions
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
break;
case S_IFGITLINK:
if (to_tempfile)
- return error("cannot create temporary subproject %s", path);
+ return error("cannot create temporary submodule %s", path);
if (mkdir(path, 0777) < 0)
- return error("cannot create subproject directory %s", path);
+ return error("cannot create submodule directory %s", path);
break;
default:
return error("unknown file mode for %s in index", path);