undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-mailinfo fixes for patch munging

Browse Source 
Don't translate the patch to UTF-8, instead preserve the data as
is.  This also reverts a test case that was included in the
original patch series.

Also allow overwriting the authorship and title information we
gather from RFC2822 mail headers with additional in-body
headers, which was pointed out by Linus.

Signed-off-by: Don Zickus <dzickus@redhat.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Don Zickus 2007-03-30 12:18:45 -04:00 committed by Junio C Hamano
parent 5ae917acdf
commit 86747c132b
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
builtin-mailinfo.c
View File

@ -294,14 +294,14 @@ static char *header[MAX_HDR_PARSED] = {
"From","Subject","Date", "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; int i;
/* search for the interesting parts */ /* search for the interesting parts */
for (i = 0; header[i]; i++) { for (i = 0; header[i]; i++) {
int len = strlen(header[i]); int len = strlen(header[i]);
if (!hdr_data[i] && if ((!hdr_data[i] || overwrite) &&
!strncasecmp(line, header[i], len) && !strncasecmp(line, header[i], len) &&
line[len] == ':' && isspace(line[len + 1])) { line[len] == ':' && isspace(line[len + 1])) {
/* Unwrap inline B and Q encoding, and optionally /* Unwrap inline B and Q encoding, and optionally
@ -614,6 +614,7 @@ static int find_boundary(void)
static int handle_boundary(void) static int handle_boundary(void)
{ {
char newline[]="\n";
again: again:
if (!memcmp(line+content_top->boundary_len, "--", 2)) { if (!memcmp(line+content_top->boundary_len, "--", 2)) {
/* we hit an end boundary */ /* we hit an end boundary */
@ -628,7 +629,7 @@ again:
"can't recover\n"); "can't recover\n");
exit(1); exit(1);
} }
handle_filter("\n"); handle_filter(newline);
/* skip to the next boundary */ /* skip to the next boundary */
if (!find_boundary()) if (!find_boundary())
@ -643,7 +644,7 @@ again:
/* slurp in this section's info */ /* slurp in this section's info */
while (read_one_header_line(line, sizeof(line), fin)) 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 */ /* eat the blank line after section info */
return (fgets(line, sizeof(line), fin) != NULL); return (fgets(line, sizeof(line), fin) != NULL);
@ -699,10 +700,14 @@ static int handle_commit_msg(char *line)
if (!*cp) if (!*cp)
return 0; 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; return 0;
} }
/* normalize the log message to UTF-8. */
if (metainfo_charset)
convert_to_utf8(line, charset);
if (patchbreak(line)) { if (patchbreak(line)) {
fclose(cmitmsg); fclose(cmitmsg);
cmitmsg = NULL; cmitmsg = NULL;
@ -767,12 +772,8 @@ static void handle_body(void)
return; return;
} }
/* Unwrap transfer encoding and optionally /* Unwrap transfer encoding */
* normalize the log message to UTF-8.
*/
decode_transfer_encoding(line); decode_transfer_encoding(line);
if (metainfo_charset)
convert_to_utf8(line, charset);
switch (transfer_encoding) { switch (transfer_encoding) {
case TE_BASE64: case TE_BASE64:
@ -875,7 +876,7 @@ int mailinfo(FILE *in, FILE *out, int ks, const char *encoding,
/* process the email header */ /* process the email header */
while (read_one_header_line(line, sizeof(line), fin)) 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_body();
handle_info(); handle_info();

2
t/t5100/patch0005
View File

@ -61,7 +61,7 @@ diff --git a/git-cvsimport-script b/git-cvsimport-script
push(@old,$fn); push(@old,$fn);
-- --
David Kågedal David Kågedal
- -
To unsubscribe from this list: send the line "unsubscribe git" in To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org the body of a message to majordomo@vger.kernel.org