cmd_fetch_pack(): return early if finish_connect() fails

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index e8a07c95e11dd4e8a305f586b3aafbda84c34a28..12220ad8dac65acaa556c6524310d5540709f324 100644 (file)
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -19,13 +19,13 @@
 #include "quote.h"
 
 static const char *fast_export_usage[] = {
-       "git fast-export [rev-list-opts]",
+       N_("git fast-export [rev-list-opts]"),
        NULL
 };
 
 static int progress;
 static enum { ABORT, VERBATIM, WARN, STRIP } signed_tag_mode = ABORT;
-static enum { ERROR, DROP, REWRITE } tag_of_filtered_mode = ABORT;
+static enum { ERROR, DROP, REWRITE } tag_of_filtered_mode = ERROR;
 static int fake_missing_tagger;
 static int use_done_feature;
 static int no_data;
@@ -51,7 +51,7 @@ static int parse_opt_tag_of_filtered_mode(const struct option *opt,
                                          const char *arg, int unset)
 {
        if (unset || !strcmp(arg, "abort"))
-               tag_of_filtered_mode = ABORT;
+               tag_of_filtered_mode = ERROR;
        else if (!strcmp(arg, "drop"))
                tag_of_filtered_mode = DROP;
        else if (!strcmp(arg, "rewrite"))
@@ -612,7 +612,7 @@ static void import_marks(char *input_file)
                        die ("Could not read blob %s", sha1_to_hex(sha1));
 
                if (object->flags & SHOWN)
-                       error("Object %s already has a mark", sha1);
+                       error("Object %s already has a mark", sha1_to_hex(sha1));
 
                mark_object(object, mark);
                if (last_idnum < mark)
@@ -632,26 +632,24 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
        char *export_filename = NULL, *import_filename = NULL;
        struct option options[] = {
                OPT_INTEGER(0, "progress", &progress,
-                           "show progress after <n> objects"),
-               OPT_CALLBACK(0, "signed-tags", &signed_tag_mode, "mode",
-                            "select handling of signed tags",
+                           N_("show progress after <n> objects")),
+               OPT_CALLBACK(0, "signed-tags", &signed_tag_mode, N_("mode"),
+                            N_("select handling of signed tags"),
                             parse_opt_signed_tag_mode),
-               OPT_CALLBACK(0, "tag-of-filtered-object", &tag_of_filtered_mode, "mode",
-                            "select handling of tags that tag filtered objects",
+               OPT_CALLBACK(0, "tag-of-filtered-object", &tag_of_filtered_mode, N_("mode"),
+                            N_("select handling of tags that tag filtered objects"),
                             parse_opt_tag_of_filtered_mode),
-               OPT_STRING(0, "export-marks", &export_filename, "file",
-                            "Dump marks to this file"),
-               OPT_STRING(0, "import-marks", &import_filename, "file",
-                            "Import marks from this file"),
+               OPT_STRING(0, "export-marks", &export_filename, N_("file"),
+                            N_("Dump marks to this file")),
+               OPT_STRING(0, "import-marks", &import_filename, N_("file"),
+                            N_("Import marks from this file")),
                OPT_BOOLEAN(0, "fake-missing-tagger", &fake_missing_tagger,
-                            "Fake a tagger when tags lack one"),
+                            N_("Fake a tagger when tags lack one")),
                OPT_BOOLEAN(0, "full-tree", &full_tree,
-                            "Output full tree for each commit"),
+                            N_("Output full tree for each commit")),
                OPT_BOOLEAN(0, "use-done-feature", &use_done_feature,
-                            "Use the done feature to terminate the stream"),
-               { OPTION_NEGBIT, 0, "data", &no_data, NULL,
-                       "Skip output of blob data",
-                       PARSE_OPT_NOARG | PARSE_OPT_NEGHELP, NULL, 1 },
+                            N_("Use the done feature to terminate the stream")),
+               OPT_BOOL(0, "no-data", &no_data, N_("Skip output of blob data")),
                OPT_END()
        };