Merge branch 'jk/mailinfo-iterative-unquote-comment'

[thirdparty/git.git] / mailinfo.c

diff --git a/mailinfo.c b/mailinfo.c
index 4acf7cb601d16fde6e2ddc206d6b06f868e6aee3..94b9b0abf228b891bc1df5a71bcd96807ed982a8 100644 (file)
--- a/mailinfo.c
+++ b/mailinfo.c
@@ -1,5 +1,7 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "config.h"
+#include "gettext.h"
+#include "hex-ll.h"
 #include "utf8.h"
 #include "strbuf.h"
 #include "mailinfo.h"
@@ -601,7 +603,7 @@ static int check_header(struct mailinfo *mi,
                ret = 1;
                goto check_header_out;
        }
-       if (parse_header(line, "Message-Id", mi, &sb)) {
+       if (parse_header(line, "Message-ID", mi, &sb)) {
                if (mi->add_message_id)
                        mi->message_id = strbuf_detach(&sb, NULL);
                ret = 1;
@@ -833,7 +835,7 @@ static int handle_commit_msg(struct mailinfo *mi, struct strbuf *line)
        if (patchbreak(line)) {
                if (mi->message_id)
                        strbuf_addf(&mi->log_message,
-                                   "Message-Id: %s\n", mi->message_id);
+                                   "Message-ID: %s\n", mi->message_id);
                return 1;
        }
 
@@ -1243,17 +1245,20 @@ int mailinfo_parse_quoted_cr_action(const char *actionstr, int *action)
        return 0;
 }
 
-static int git_mailinfo_config(const char *var, const char *value, void *mi_)
+static int git_mailinfo_config(const char *var, const char *value,
+                              const struct config_context *ctx, void *mi_)
 {
        struct mailinfo *mi = mi_;
 
        if (!starts_with(var, "mailinfo."))
-               return git_default_config(var, value, NULL);
+               return git_default_config(var, value, ctx, NULL);
        if (!strcmp(var, "mailinfo.scissors")) {
                mi->use_scissors = git_config_bool(var, value);
                return 0;
        }
        if (!strcmp(var, "mailinfo.quotedcr")) {
+               if (!value)
+                       return config_error_nonbool(var);
                if (mailinfo_parse_quoted_cr_action(value, &mi->quoted_cr) != 0)
                        return error(_("bad action '%s' for '%s'"), value, var);
                return 0;