From: Thomas Rast <trast@inf.ethz.ch>
To: <git@vger.kernel.org>
Cc: "Ralf Thielow" <ralf.thielow@gmail.com>, "Jan Krüger" <jk@jk.gs>,
"Christian Stimming" <stimming@tuhh.de>
Subject: [PATCH 1/2] apply, entry: speak of submodules instead of subprojects
Date: Tue, 16 Jul 2013 11:21:59 +0200 [thread overview]
Message-ID: <8df0d41caa10a38e46783bebd3148a7b8445dd47.1373966389.git.trast@inf.ethz.ch> (raw)
In-Reply-To: <87bo631odi.fsf@hexa.v.cablecom.net>
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>
---
This and the next one are message changes for things I found during my
review.
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
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);
--
1.8.3.2.998.g1d087bc
next prev parent reply other threads:[~2013-07-16 9:22 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-12 17:15 [PATCH 0/3] Switch German translation from pure German to German+English Ralf Thielow
2013-06-12 17:15 ` [PATCH 1/3] l10n: de.po: switch from pure German to German+English (part 1) Ralf Thielow
2013-06-12 17:15 ` [PATCH 2/3] l10n: de.po: switch from pure German to German+English (part 2) Ralf Thielow
2013-06-12 17:15 ` [PATCH 3/3] l10n: de.po: switch from pure German to German+English (part 3) Ralf Thielow
2013-07-10 17:54 ` [PATCHv2 0/3] Switch German translation to G+E Ralf Thielow
2013-07-10 17:54 ` [PATCHv2 1/3] l10n: de.po: switch from pure German to German+English (part 1) Ralf Thielow
2013-07-10 17:54 ` [PATCHv2 2/3] l10n: de.po: switch from pure German to German+English (part 2) Ralf Thielow
2013-07-10 17:54 ` [PATCHv2 3/3] l10n: de.po: switch from pure German to German+English (part 3) Ralf Thielow
2013-07-15 21:53 ` Thomas Rast
2013-07-15 21:53 ` [PATCHv2 2/3] l10n: de.po: switch from pure German to German+English (part 2) Thomas Rast
2013-07-15 21:53 ` [PATCHv2 1/3] l10n: de.po: switch from pure German to German+English (part 1) Thomas Rast
2013-07-15 21:53 ` [PATCHv2 0/3] Switch German translation to G+E Thomas Rast
2013-07-16 9:21 ` Thomas Rast [this message]
2013-07-16 9:22 ` [PATCH 2/2] show-branch: fix description of --date-order Thomas Rast
2013-07-16 18:22 ` Jonathan Nieder
2013-07-16 20:11 ` Thomas Rast
2013-07-16 18:07 ` [PATCH 1/2] apply, entry: speak of submodules instead of subprojects Jonathan Nieder
2013-07-16 19:05 ` Jens Lehmann
2013-07-16 20:07 ` Thomas Rast
2013-07-17 20:34 ` Junio C Hamano
2013-07-17 5:51 ` [PATCHv3 0/3] Switch German translation to G+E Ralf Thielow
2013-07-17 5:51 ` [PATCHv3 1/3] l10n: de.po: switch from pure German to German+English (part 1) Ralf Thielow
2013-07-17 5:51 ` [PATCHv3 2/3] l10n: de.po: switch from pure German to German+English (part 2) Ralf Thielow
2013-07-17 5:51 ` [PATCHv3 3/3] l10n: de.po: switch from pure German to German+English (part 3) Ralf Thielow
2013-07-17 9:35 ` [PATCHv3 1/3] l10n: de.po: switch from pure German to German+English (part 1) Thomas Rast
2013-07-17 16:24 ` [PATCH v3 0/3] Switch German translation to G+E Ralf Thielow
2013-07-17 16:24 ` [PATCH v3 1/3] l10n: de.po: switch from pure German to German+English (part 1) Ralf Thielow
2013-07-17 16:24 ` [PATCH v3 2/3] l10n: de.po: switch from pure German to German+English (part 2) Ralf Thielow
2013-07-17 16:24 ` [PATCH v3 3/3] l10n: de.po: switch from pure German to German+English (part 3) Ralf Thielow
2013-07-19 16:45 ` [PATCH v3 1/3] l10n: de.po: switch from pure German to German+English (part 1) Ralf Thielow
2013-07-18 12:09 ` [PATCH v3 0/3] Switch German translation to G+E Thomas Rast
2013-07-18 19:37 ` Junio C Hamano
2013-07-21 13:53 ` Jiang Xin
2013-07-18 12:26 ` [PATCH v2 1/2] apply, entry: speak of submodules instead of subprojects Thomas Rast
2013-07-18 12:26 ` [PATCH v2 2/2] show-branch: fix description of --date-order Thomas Rast
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8df0d41caa10a38e46783bebd3148a7b8445dd47.1373966389.git.trast@inf.ethz.ch \
--to=trast@inf.ethz.ch \
--cc=git@vger.kernel.org \
--cc=jk@jk.gs \
--cc=ralf.thielow@gmail.com \
--cc=stimming@tuhh.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).