Changeset 782 for git/branches/dmik/builtin/mktree.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/mktree.c (modified) (3 diffs)

git/branches/dmik/builtin/mktree.c ¶

@@ -24 +24 @@
                 die("path %s contains slash", path);
 
-        if (alloc <= used) {
-                alloc = alloc_nr(used);
-                entries = xrealloc(entries, sizeof(*entries) * alloc);
-        }
+        ALLOC_GROW(entries, used + 1, alloc);
         ent = entries[used++] = xmalloc(sizeof(**entries) + len + 1);
         ent->mode = mode;
@@ -65 +62 @@
 
 static const char *mktree_usage[] = {
-        "git mktree [-z] [--missing] [--batch]",
+        N_("git mktree [-z] [--missing] [--batch]"),
         NULL
 };
@@ -151 +148 @@
 
         const struct option option[] = {
-                OPT_SET_INT('z', NULL, &line_termination, "input is NUL terminated", '\0'),
-                OPT_SET_INT( 0 , "missing", &allow_missing, "allow missing objects", 1),
-                OPT_SET_INT( 0 , "batch", &is_batch_mode, "allow creation of more than one tree", 1),
+                OPT_SET_INT('z', NULL, &line_termination, N_("input is NUL terminated"), '\0'),
+                OPT_SET_INT( 0 , "missing", &allow_missing, N_("allow missing objects"), 1),
+                OPT_SET_INT( 0 , "batch", &is_batch_mode, N_("allow creation of more than one tree"), 1),
                 OPT_END()
         };