From 42063f95a0f285382458f357bd256df252000ef1 Mon Sep 17 00:00:00 2001 From: Thomas Rast Date: Thu, 18 Jul 2013 14:26:55 +0200 Subject: [PATCH 1/2] 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 Reviewed-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- 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 3979f8bf3d..14c91bf35a 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 d7c131d453..6af4b6a0c3 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); From 465cf8ce453dc3e266171ece2ea886acd8c7d714 Mon Sep 17 00:00:00 2001 From: Thomas Rast Date: Thu, 18 Jul 2013 14:26:56 +0200 Subject: [PATCH 2/2] show-branch: fix description of --date-order The existing description reads as if it somehow applies a filter. Change it to explain that it is merely about the ordering. Message-proposed-by: Jonathan Nieder Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano --- builtin/show-branch.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/show-branch.c b/builtin/show-branch.c index 90fc6b1b9d..427aa39b1b 100644 --- a/builtin/show-branch.c +++ b/builtin/show-branch.c @@ -671,9 +671,9 @@ int cmd_show_branch(int ac, const char **av, const char *prefix) N_("show only commits not on the first branch")), OPT_SET_INT(0, "sparse", &dense, N_("show merges reachable from only one tip"), 0), - OPT_SET_INT(0, "date-order", &lifo, - N_("show commits where no parent comes before its " - "children"), 0), + OPT_SET_INT(0, "date-order", &sort_order, + N_("topologically sort, maintaining date order " + "where possible"), 0), { OPTION_CALLBACK, 'g', "reflog", &reflog_base, N_("[,]"), N_("show most recent ref-log entries starting at " "base"),