Merge branch 'tr/do-not-call-submodules-subprojects'
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Jul 2013 18:23:30 +0000 (11:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Jul 2013 18:23:30 +0000 (11:23 -0700)
* tr/do-not-call-submodules-subprojects:
  show-branch: fix description of --date-order
  apply, entry: speak of submodules instead of subprojects

builtin/apply.c
builtin/show-branch.c
entry.c

index ff01ebf..240a05c 100644 (file)
@@ -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)
index 99ec4af..9788eb1 100644 (file)
@@ -673,8 +673,8 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
                OPT_SET_INT(0, "sparse", &dense,
                            N_("show merges reachable from only one tip"), 0),
                OPT_SET_INT(0, "date-order", &sort_order,
-                           N_("show commits where no parent comes before its "
-                              "children"),
+                           N_("topologically sort, maintaining date order "
+                              "where possible"),
                            REV_SORT_BY_COMMIT_DATE),
                { OPTION_CALLBACK, 'g', "reflog", &reflog_base, N_("<n>[,<base>]"),
                            N_("show <n> most recent ref-log entries starting at "
diff --git a/entry.c b/entry.c
index d7c131d..6af4b6a 100644 (file)
--- 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);