Changeset 782 for git/branches/dmik/builtin/ls-tree.c

Timestamp:

Jun 23, 2014, 9:45:51 PM (11 years ago)

Author:

dmik

Message:

git: Merge version 2.0.0 from vendor to dmik branch.

Location:

git/branches/dmik

Files:

• . (modified) (1 prop)
• builtin/ls-tree.c (modified) (5 diffs)

git/branches/dmik/builtin/ls-tree.c ¶

@@ -11 +11 @@
 #include "builtin.h"
 #include "parse-options.h"
+#include "pathspec.h"
 
 static int line_termination = '\n';
@@ -25 +26 @@
 
 static const  char * const ls_tree_usage[] = {
-        "git ls-tree [<options>] <tree-ish> [<path>...]",
+        N_("git ls-tree [<options>] <tree-ish> [<path>...]"),
         NULL
 };
@@ -36 +37 @@
                 return 1;
 
-        s = pathspec.raw;
+        s = pathspec._raw;
         if (!s)
                 return 0;
@@ -123 +124 @@
         int i, full_tree = 0;
         const struct option ls_tree_options[] = {
-                OPT_BIT('d', NULL, &ls_options, "only show trees",
+                OPT_BIT('d', NULL, &ls_options, N_("only show trees"),
                         LS_TREE_ONLY),
-                OPT_BIT('r', NULL, &ls_options, "recurse into subtrees",
+                OPT_BIT('r', NULL, &ls_options, N_("recurse into subtrees"),
                         LS_RECURSIVE),
-                OPT_BIT('t', NULL, &ls_options, "show trees when recursing",
+                OPT_BIT('t', NULL, &ls_options, N_("show trees when recursing"),
                         LS_SHOW_TREES),
                 OPT_SET_INT('z', NULL, &line_termination,
-                            "terminate entries with NUL byte", 0),
-                OPT_BIT('l', "long", &ls_options, "include object size",
+                            N_("terminate entries with NUL byte"), 0),
+                OPT_BIT('l', "long", &ls_options, N_("include object size"),
                         LS_SHOW_SIZE),
-                OPT_BIT(0, "name-only", &ls_options, "list only filenames",
+                OPT_BIT(0, "name-only", &ls_options, N_("list only filenames"),
                         LS_NAME_ONLY),
-                OPT_BIT(0, "name-status", &ls_options, "list only filenames",
+                OPT_BIT(0, "name-status", &ls_options, N_("list only filenames"),
                         LS_NAME_ONLY),
                 OPT_SET_INT(0, "full-name", &chomp_prefix,
-                            "use full path names", 0),
-                OPT_BOOLEAN(0, "full-tree", &full_tree,
-                            "list entire tree; not just current directory "
-                            "(implies --full-name)"),
+                            N_("use full path names"), 0),
+                OPT_BOOL(0, "full-tree", &full_tree,
+                         N_("list entire tree; not just current directory "
+                            "(implies --full-name)")),
                 OPT__ABBREV(&abbrev),
                 OPT_END()
@@ -167 +168 @@
                 die("Not a valid object name %s", argv[0]);
 
-        init_pathspec(&pathspec, get_pathspec(prefix, argv + 1));
+        /*
+         * show_recursive() rolls its own matching code and is
+         * generally ignorant of 'struct pathspec'. The magic mask
+         * cannot be lifted until it is converted to use
+         * match_pathspec() or tree_entry_interesting()
+         */
+        parse_pathspec(&pathspec, PATHSPEC_GLOB | PATHSPEC_ICASE,
+                       PATHSPEC_PREFER_CWD,
+                       prefix, argv + 1);
         for (i = 0; i < pathspec.nr; i++)
-                pathspec.items[i].use_wildcard = 0;
+                pathspec.items[i].nowildcard_len = pathspec.items[i].len;
         pathspec.has_wildcard = 0;
         tree = parse_tree_indirect(sha1);