config: pass kvi to die_bad_number()

[thirdparty/git.git] / builtin / log.c

diff --git a/builtin/log.c b/builtin/log.c
index 676de107d61470360276e8c6439d919213ba3635..c7337354aaf95d2e97e237104eca80549e0e9dd0 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -564,7 +564,8 @@ static int cmd_log_walk(struct rev_info *rev)
        return retval;
 }
 
-static int git_log_config(const char *var, const char *value, void *cb)
+static int git_log_config(const char *var, const char *value,
+                         const struct config_context *ctx, void *cb)
 {
        const char *slot_name;
 
@@ -573,7 +574,7 @@ static int git_log_config(const char *var, const char *value, void *cb)
        if (!strcmp(var, "format.subjectprefix"))
                return git_config_string(&fmt_patch_subject_prefix, var, value);
        if (!strcmp(var, "format.filenamemaxlength")) {
-               fmt_patch_name_max = git_config_int(var, value);
+               fmt_patch_name_max = git_config_int(var, value, ctx->kvi);
                return 0;
        }
        if (!strcmp(var, "format.encodeemailheaders")) {
@@ -613,7 +614,7 @@ static int git_log_config(const char *var, const char *value, void *cb)
                return 0;
        }
 
-       return git_diff_ui_config(var, value, cb);
+       return git_diff_ui_config(var, value, ctx, cb);
 }
 
 int cmd_whatchanged(int argc, const char **argv, const char *prefix)
@@ -866,7 +867,7 @@ static void log_setup_revisions_tweak(struct rev_info *rev,
                                      struct setup_revision_opt *opt)
 {
        if (rev->diffopt.flags.default_follow_renames &&
-           rev->prune_data.nr == 1)
+           diff_check_follow_pathspec(&rev->prune_data, 0))
                rev->diffopt.flags.follow_renames = 1;
 
        if (rev->first_parent_only)
@@ -979,7 +980,8 @@ static enum cover_from_description parse_cover_from_description(const char *arg)
                die(_("%s: invalid cover from description mode"), arg);
 }
 
-static int git_format_config(const char *var, const char *value, void *cb)
+static int git_format_config(const char *var, const char *value,
+                            const struct config_context *ctx, void *cb)
 {
        if (!strcmp(var, "format.headers")) {
                if (!value)
@@ -1108,7 +1110,7 @@ static int git_format_config(const char *var, const char *value, void *cb)
        if (!strcmp(var, "diff.noprefix"))
                return 0;
 
-       return git_log_config(var, value, cb);
+       return git_log_config(var, value, ctx, cb);
 }
 
 static const char *output_directory = NULL;
@@ -1406,7 +1408,7 @@ static void make_cover_letter(struct rev_info *rev, int use_separate_file,
        }
 }
 
-static const char *clean_message_id(const char *msg_id)
+static char *clean_message_id(const char *msg_id)
 {
        char ch;
        const char *a, *z, *m;
@@ -1424,7 +1426,7 @@ static const char *clean_message_id(const char *msg_id)
        if (!z)
                die(_("insane in-reply-to: %s"), msg_id);
        if (++z == m)
-               return a;
+               return xstrdup(a);
        return xmemdupz(a, z - a);
 }
 
@@ -2310,11 +2312,11 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 
        if (in_reply_to || thread || cover_letter) {
                rev.ref_message_ids = xmalloc(sizeof(*rev.ref_message_ids));
-               string_list_init_nodup(rev.ref_message_ids);
+               string_list_init_dup(rev.ref_message_ids);
        }
        if (in_reply_to) {
-               const char *msgid = clean_message_id(in_reply_to);
-               string_list_append(rev.ref_message_ids, msgid);
+               char *msgid = clean_message_id(in_reply_to);
+               string_list_append_nodup(rev.ref_message_ids, msgid);
        }
        rev.numbered_files = just_numbers;
        rev.patch_suffix = fmt_patch_suffix;
@@ -2370,8 +2372,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
                                    && (!cover_letter || rev.nr > 1))
                                        free(rev.message_id);
                                else
-                                       string_list_append(rev.ref_message_ids,
-                                                          rev.message_id);
+                                       string_list_append_nodup(rev.ref_message_ids,
+                                                                rev.message_id);
                        }
                        gen_message_id(&rev, oid_to_hex(&commit->object.oid));
                }
@@ -2420,6 +2422,7 @@ done:
        strbuf_release(&rdiff_title);
        strbuf_release(&sprefix);
        free(to_free);
+       free(rev.message_id);
        if (rev.ref_message_ids)
                string_list_clear(rev.ref_message_ids, 0);
        free(rev.ref_message_ids);