Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()

diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
index 3f5cb8719b4f659fa1f5de422bd890304f223768..c95e477e831dd436f074bbca9b2b9ca5ad5a5eb1 100644 (file)
--- a/builtin-mailinfo.c
+++ b/builtin-mailinfo.c
@@ -294,14 +294,14 @@ static char *header[MAX_HDR_PARSED] = {
        "From","Subject","Date",
 };
 
-static int check_header(char *line, char **hdr_data)
+static int check_header(char *line, char **hdr_data, int overwrite)
 {
        int i;
 
        /* search for the interesting parts */
        for (i = 0; header[i]; i++) {
                int len = strlen(header[i]);
-               if (!hdr_data[i] &&
+               if ((!hdr_data[i] || overwrite) &&
                    !strncasecmp(line, header[i], len) &&
                    line[len] == ':' && isspace(line[len + 1])) {
                        /* Unwrap inline B and Q encoding, and optionally
@@ -614,6 +614,7 @@ static int find_boundary(void)
 
 static int handle_boundary(void)
 {
+       char newline[]="\n";
 again:
        if (!memcmp(line+content_top->boundary_len, "--", 2)) {
                /* we hit an end boundary */
@@ -628,7 +629,7 @@ static int handle_boundary(void)
                                        "can't recover\n");
                        exit(1);
                }
-               handle_filter("\n");
+               handle_filter(newline);
 
                /* skip to the next boundary */
                if (!find_boundary())
@@ -643,12 +644,45 @@ static int handle_boundary(void)
 
        /* slurp in this section's info */
        while (read_one_header_line(line, sizeof(line), fin))
-               check_header(line, p_hdr_data);
+               check_header(line, p_hdr_data, 0);
 
        /* eat the blank line after section info */
        return (fgets(line, sizeof(line), fin) != NULL);
 }
 
+static inline int patchbreak(const char *line)
+{
+       /* Beginning of a "diff -" header? */
+       if (!memcmp("diff -", line, 6))
+               return 1;
+
+       /* CVS "Index: " line? */
+       if (!memcmp("Index: ", line, 7))
+               return 1;
+
+       /*
+        * "--- <filename>" starts patches without headers
+        * "---<sp>*" is a manual separator
+        */
+       if (!memcmp("---", line, 3)) {
+               line += 3;
+               /* space followed by a filename? */
+               if (line[0] == ' ' && !isspace(line[1]))
+                       return 1;
+               /* Just whitespace? */
+               for (;;) {
+                       unsigned char c = *line++;
+                       if (c == '\n')
+                               return 1;
+                       if (!isspace(c))
+                               break;
+               }
+               return 0;
+       }
+       return 0;
+}
+
+
 static int handle_commit_msg(char *line)
 {
        static int still_looking = 1;
@@ -666,13 +700,15 @@ static int handle_commit_msg(char *line)
                        if (!*cp)
                                return 0;
                }
-               if ((still_looking = check_header(cp, s_hdr_data)) != 0)
+               if ((still_looking = check_header(cp, s_hdr_data, 0)) != 0)
                        return 0;
        }
 
-       if (!memcmp("diff -", line, 6) ||
-           !memcmp("---", line, 3) ||
-           !memcmp("Index: ", line, 7)) {
+       /* normalize the log message to UTF-8. */
+       if (metainfo_charset)
+               convert_to_utf8(line, charset);
+
+       if (patchbreak(line)) {
                fclose(cmitmsg);
                cmitmsg = NULL;
                return 1;
@@ -736,12 +772,8 @@ static void handle_body(void)
                                return;
                }
 
-               /* Unwrap transfer encoding and optionally
-                * normalize the log message to UTF-8.
-                */
+               /* Unwrap transfer encoding */
                decode_transfer_encoding(line);
-               if (metainfo_charset)
-                       convert_to_utf8(line, charset);
 
                switch (transfer_encoding) {
                case TE_BASE64:
@@ -844,7 +876,7 @@ int mailinfo(FILE *in, FILE *out, int ks, const char *encoding,
 
        /* process the email header */
        while (read_one_header_line(line, sizeof(line), fin))
-               check_header(line, p_hdr_data);
+               check_header(line, p_hdr_data, 1);
 
        handle_body();
        handle_info();