fetch-pack: eliminate spurious error messages
[gitweb.git] / builtin / pack-objects.c
index f3348208d89a4fbeb3ae9f79376d7d21a8f9015c..5e140640947cd9c38da00a01d8db9f036e8babd7 100644 (file)
@@ -20,8 +20,8 @@
 #include "thread-utils.h"
 
 static const char *pack_usage[] = {
-       "git pack-objects --stdout [options...] [< ref-list | < object-list]",
-       "git pack-objects [options...] base-name [< ref-list | < object-list]",
+       N_("git pack-objects --stdout [options...] [< ref-list | < object-list]"),
+       N_("git pack-objects [options...] base-name [< ref-list | < object-list]"),
        NULL
 };
 
@@ -2373,7 +2373,7 @@ static void get_object_list(int ac, const char **av)
                        }
                        die("not a rev '%s'", line);
                }
-               if (handle_revision_arg(line, &revs, flags, 1))
+               if (handle_revision_arg(line, &revs, flags, REVARG_CANNOT_BE_FILENAME))
                        die("bad revision '%s'", line);
        }
 
@@ -2445,67 +2445,67 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
        int rev_list_unpacked = 0, rev_list_all = 0, rev_list_reflog = 0;
        struct option pack_objects_options[] = {
                OPT_SET_INT('q', "quiet", &progress,
-                           "do not show progress meter", 0),
+                           N_("do not show progress meter"), 0),
                OPT_SET_INT(0, "progress", &progress,
-                           "show progress meter", 1),
+                           N_("show progress meter"), 1),
                OPT_SET_INT(0, "all-progress", &progress,
-                           "show progress meter during object writing phase", 2),
+                           N_("show progress meter during object writing phase"), 2),
                OPT_BOOL(0, "all-progress-implied",
                         &all_progress_implied,
-                        "similar to --all-progress when progress meter is shown"),
-               { OPTION_CALLBACK, 0, "index-version", NULL, "version[,offset]",
-                 "write the pack index file in the specified idx format version",
+                        N_("similar to --all-progress when progress meter is shown")),
+               { OPTION_CALLBACK, 0, "index-version", NULL, N_("version[,offset]"),
+                 N_("write the pack index file in the specified idx format version"),
                  0, option_parse_index_version },
                OPT_ULONG(0, "max-pack-size", &pack_size_limit,
-                         "maximum size of each output pack file"),
+                         N_("maximum size of each output pack file")),
                OPT_BOOL(0, "local", &local,
-                        "ignore borrowed objects from alternate object store"),
+                        N_("ignore borrowed objects from alternate object store")),
                OPT_BOOL(0, "incremental", &incremental,
-                        "ignore packed objects"),
+                        N_("ignore packed objects")),
                OPT_INTEGER(0, "window", &window,
-                           "limit pack window by objects"),
+                           N_("limit pack window by objects")),
                OPT_ULONG(0, "window-memory", &window_memory_limit,
-                         "limit pack window by memory in addition to object limit"),
+                         N_("limit pack window by memory in addition to object limit")),
                OPT_INTEGER(0, "depth", &depth,
-                           "maximum length of delta chain allowed in the resulting pack"),
+                           N_("maximum length of delta chain allowed in the resulting pack")),
                OPT_BOOL(0, "reuse-delta", &reuse_delta,
-                        "reuse existing deltas"),
+                        N_("reuse existing deltas")),
                OPT_BOOL(0, "reuse-object", &reuse_object,
-                        "reuse existing objects"),
+                        N_("reuse existing objects")),
                OPT_BOOL(0, "delta-base-offset", &allow_ofs_delta,
-                        "use OFS_DELTA objects"),
+                        N_("use OFS_DELTA objects")),
                OPT_INTEGER(0, "threads", &delta_search_threads,
-                           "use threads when searching for best delta matches"),
+                           N_("use threads when searching for best delta matches")),
                OPT_BOOL(0, "non-empty", &non_empty,
-                        "do not create an empty pack output"),
+                        N_("do not create an empty pack output")),
                OPT_BOOL(0, "revs", &use_internal_rev_list,
-                        "read revision arguments from standard input"),
+                        N_("read revision arguments from standard input")),
                { OPTION_SET_INT, 0, "unpacked", &rev_list_unpacked, NULL,
-                 "limit the objects to those that are not yet packed",
+                 N_("limit the objects to those that are not yet packed"),
                  PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 },
                { OPTION_SET_INT, 0, "all", &rev_list_all, NULL,
-                 "include objects reachable from any reference",
+                 N_("include objects reachable from any reference"),
                  PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 },
                { OPTION_SET_INT, 0, "reflog", &rev_list_reflog, NULL,
-                 "include objects referred by reflog entries",
+                 N_("include objects referred by reflog entries"),
                  PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 },
                OPT_BOOL(0, "stdout", &pack_to_stdout,
-                        "output pack to stdout"),
+                        N_("output pack to stdout")),
                OPT_BOOL(0, "include-tag", &include_tag,
-                        "include tag objects that refer to objects to be packed"),
+                        N_("include tag objects that refer to objects to be packed")),
                OPT_BOOL(0, "keep-unreachable", &keep_unreachable,
-                        "keep unreachable objects"),
-               { OPTION_CALLBACK, 0, "unpack-unreachable", NULL, "time",
-                 "unpack unreachable objects newer than <time>",
+                        N_("keep unreachable objects")),
+               { OPTION_CALLBACK, 0, "unpack-unreachable", NULL, N_("time"),
+                 N_("unpack unreachable objects newer than <time>"),
                  PARSE_OPT_OPTARG, option_parse_unpack_unreachable },
                OPT_BOOL(0, "thin", &thin,
-                        "create thin packs"),
+                        N_("create thin packs")),
                OPT_BOOL(0, "honor-pack-keep", &ignore_packed_keep,
-                        "ignore packs that have companion .keep file"),
+                        N_("ignore packs that have companion .keep file")),
                OPT_INTEGER(0, "compression", &pack_compression_level,
-                           "pack compression level"),
+                           N_("pack compression level")),
                OPT_SET_INT(0, "keep-true-parents", &grafts_replace_parents,
-                           "do not hide commits by grafts", 0),
+                           N_("do not hide commits by grafts"), 0),
                OPT_END(),
        };