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

1  2 
builtin/apply.c
builtin/show-branch.c

diff --combined builtin/apply.c
@@@ -722,7 -722,7 +722,7 @@@ static char *find_name(const char *line
  
  static char *find_name_traditional(const char *line, char *def, int p_value)
  {
 -      size_t len = strlen(line);
 +      size_t len;
        size_t date_len;
  
        if (*line == '"') {
@@@ -3525,7 -3525,7 +3525,7 @@@ static int check_patch(struct patch *pa
                ok_if_exists = 0;
  
        if (new_name &&
 -          ((0 < patch->is_new) | (0 < patch->is_rename) | patch->is_copy)) {
 +          ((0 < patch->is_new) || patch->is_rename || patch->is_copy)) {
                int err = check_to_create(new_name, ok_if_exists);
  
                if (err && threeway) {
@@@ -3847,7 -3847,7 +3847,7 @@@ static void add_index_file(const char *
                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 --combined builtin/show-branch.c
@@@ -630,7 -630,7 +630,7 @@@ int cmd_show_branch(int ac, const char 
        int num_rev, i, extra = 0;
        int all_heads = 0, all_remotes = 0;
        int all_mask, all_revs;
 -      int lifo = 1;
 +      enum rev_sort_order sort_order = REV_SORT_IN_GRAPH_ORDER;
        char head[128];
        const char *head_p;
        int head_len;
                            N_("show possible merge bases")),
                OPT_BOOLEAN(0, "independent", &independent,
                            N_("show refs unreachable from any other ref")),
 -              OPT_BOOLEAN(0, "topo-order", &lifo,
 -                          N_("show commits in topological order")),
 +              OPT_SET_INT(0, "topo-order", &sort_order,
 +                          N_("show commits in topological order"),
 +                          REV_SORT_IN_GRAPH_ORDER),
                OPT_BOOLEAN(0, "topics", &topics,
                            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", &sort_order,
-                           N_("show commits where no parent comes before its "
-                              "children"),
+                           N_("topologically sort, maintaining date order "
 -                             "where possible"), 0),
++                             "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 "
                               "base"),
                exit(0);
  
        /* Sort topologically */
 -      sort_in_topological_order(&seen, lifo);
 +      sort_in_topological_order(&seen, sort_order);
  
        /* Give names to commits */
        if (!sha1_name && !no_name)