grep: move logic to compile header pattern into a separate helper

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 9d618c21d214b60e71ad6e2986234f95d738db07..eef2b48d9856c90b2d8fd7b2e06f8179c08faeac 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -279,7 +279,6 @@ static void show_local_changes(struct object *head)
        struct rev_info rev;
        /* I think we want full paths, even if we're in a subdirectory. */
        init_revisions(&rev, NULL);
-       rev.abbrev = 0;
        rev.diffopt.output_format |= DIFF_FORMAT_NAME_STATUS;
        if (diff_setup_done(&rev.diffopt) < 0)
                die("diff_setup_done failed");
@@ -496,12 +495,12 @@ static void update_refs_for_switch(struct checkout_opts *opts,
                if (opts->new_orphan_branch) {
                        if (opts->new_branch_log && !log_all_ref_updates) {
                                int temp;
-                               char *log_file;
+                               char log_file[PATH_MAX];
                                char *ref_name = mkpath("refs/heads/%s", opts->new_orphan_branch);
 
                                temp = log_all_ref_updates;
                                log_all_ref_updates = 1;
-                               if (log_ref_setup(ref_name, &log_file)) {
+                               if (log_ref_setup(ref_name, log_file, sizeof(log_file))) {
                                        fprintf(stderr, "Can not do reflog for '%s'\n",
                                            opts->new_orphan_branch);
                                        log_all_ref_updates = temp;
@@ -636,7 +635,8 @@ static int check_tracking_name(const char *refname, const unsigned char *sha1,
 
 static const char *unique_tracking_name(const char *name)
 {
-       struct tracking_name_data cb_data = { name, NULL, 1 };
+       struct tracking_name_data cb_data = { NULL, NULL, 1 };
+       cb_data.name = name;
        for_each_ref(check_tracking_name, &cb_data);
        if (cb_data.unique)
                return cb_data.remote;