Merge branch 'lk/more-helpful-status-hints'

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 19509ea75485083b40d6c7944541a5f628b6049b..9ab6db3fb042d0cb7ee3a1919788b9a6cd26a3d6 100644 (file)
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -185,6 +185,8 @@ static void print_path(const char *path)
        int need_quote = quote_c_style(path, NULL, NULL, 0);
        if (need_quote)
                quote_c_style(path, NULL, stdout, 0);
+       else if (strchr(path, ' '))
+               printf("\"%s\"", path);
        else
                printf("%s", path);
 }
@@ -610,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)