Merge branch 'dl/complete-cherry-pick-revert-skip'

diff --git a/pretty.c b/pretty.c
index f496f0f1284db4ea7c6a20022311381bd9dc1b64..e4ed14effe1aabdef50155b932a96e6648ff4707 100644 (file)
--- a/pretty.c
+++ b/pretty.c
@@ -106,8 +106,8 @@ static void setup_commit_formats(void)
        commit_formats_len = ARRAY_SIZE(builtin_formats);
        builtin_formats_len = commit_formats_len;
        ALLOC_GROW(commit_formats, commit_formats_len, commit_formats_alloc);
-       memcpy(commit_formats, builtin_formats,
-              sizeof(*builtin_formats)*ARRAY_SIZE(builtin_formats));
+       COPY_ARRAY(commit_formats, builtin_formats,
+                  ARRAY_SIZE(builtin_formats));
 
        git_config(git_pretty_formats_config, NULL);
 }
@@ -343,8 +343,7 @@ static int is_rfc2047_special(char ch, enum rfc2047_type type)
        return !(isalnum(ch) || ch == '!' || ch == '*' || ch == '+' || ch == '-' || ch == '/');
 }
 
-static int needs_rfc2047_encoding(const char *line, int len,
-                                 enum rfc2047_type type)
+static int needs_rfc2047_encoding(const char *line, int len)
 {
        int i;
 
@@ -470,7 +469,7 @@ void pp_user_info(struct pretty_print_context *pp,
                }
 
                strbuf_addstr(sb, "From: ");
-               if (needs_rfc2047_encoding(namebuf, namelen, RFC2047_ADDRESS)) {
+               if (needs_rfc2047_encoding(namebuf, namelen)) {
                        add_rfc2047(sb, namebuf, namelen,
                                    encoding, RFC2047_ADDRESS);
                        max_length = 76; /* per rfc2047 */
@@ -989,8 +988,7 @@ static size_t parse_color(struct strbuf *sb, /* in UTF-8 */
        return rest - placeholder;
 }
 
-static size_t parse_padding_placeholder(struct strbuf *sb,
-                                       const char *placeholder,
+static size_t parse_padding_placeholder(const char *placeholder,
                                        struct format_commit_context *c)
 {
        const char *ch = placeholder;
@@ -1195,7 +1193,7 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
 
        case '<':
        case '>':
-               return parse_padding_placeholder(sb, placeholder, c);
+               return parse_padding_placeholder(placeholder, c);
        }
 
        /* these depend on the commit */
@@ -1728,7 +1726,7 @@ void pp_title_line(struct pretty_print_context *pp,
        if (pp->print_email_subject) {
                if (pp->rev)
                        fmt_output_email_subject(sb, pp->rev);
-               if (needs_rfc2047_encoding(title.buf, title.len, RFC2047_SUBJECT))
+               if (needs_rfc2047_encoding(title.buf, title.len))
                        add_rfc2047(sb, title.buf, title.len,
                                                encoding, RFC2047_SUBJECT);
                else