cmd_show_branch(): fix error message

diff --git a/builtin/fsck.c b/builtin/fsck.c
index a27515aeaa2debabdb14a03d271fe423d13b19d2..48d0c2e6f05d1657b5313227952b5eb55edba44e 100644 (file)
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -225,12 +225,12 @@ static void check_unreachable_object(struct object *obj)
                        printf("dangling %s %s\n", typename(obj->type),
                               sha1_to_hex(obj->sha1));
                if (write_lost_and_found) {
-                       char *filename = git_path("lost-found/%s/%s",
+                       const char *filename = git_path("lost-found/%s/%s",
                                obj->type == OBJ_COMMIT ? "commit" : "other",
                                sha1_to_hex(obj->sha1));
                        FILE *f;
 
-                       if (safe_create_leading_directories(filename)) {
+                       if (safe_create_leading_directories_const(filename)) {
                                error("Could not create lost-found");
                                return;
                        }
@@ -504,11 +504,16 @@ static int fsck_handle_ref(const char *refname, const unsigned char *sha1, int f
 
 static void get_default_heads(void)
 {
+       struct each_ref_fn_sha1_adapter wrapped_fsck_handle_ref =
+               {fsck_handle_ref, NULL};
+       struct each_ref_fn_sha1_adapter wrapped_fsck_handle_reflog =
+               {fsck_handle_reflog, NULL};
+
        if (head_points_at && !is_null_sha1(head_sha1))
                fsck_handle_ref("HEAD", head_sha1, 0, NULL);
-       for_each_rawref(fsck_handle_ref, NULL);
+       for_each_rawref(each_ref_fn_adapter, &wrapped_fsck_handle_ref);
        if (include_reflogs)
-               for_each_reflog(fsck_handle_reflog, NULL);
+               for_each_reflog(each_ref_fn_adapter, &wrapped_fsck_handle_reflog);
 
        /*
         * Not having any default heads isn't really fatal, but
@@ -600,7 +605,7 @@ static int fsck_cache_tree(struct cache_tree *it)
 }
 
 static char const * const fsck_usage[] = {
-       N_("git fsck [options] [<object>...]"),
+       N_("git fsck [<options>] [<object>...]"),
        NULL
 };