Merge with master.

diff --git a/tools/mailinfo.c b/tools/mailinfo.c
index 5a857f711a0de4e9d098d3c1a7ca23ead0030384..fb2ea2b70bf56c59da34bd90158b929b8ee56caa 100644 (file)
--- a/tools/mailinfo.c
+++ b/tools/mailinfo.c
@@ -152,13 +152,13 @@ static void cleanup_space(char *buf)
 
 static void handle_rest(void)
 {
+       FILE *out = cmitmsg;
        char *sub = cleanup_subject(subject);
        cleanup_space(name);
        cleanup_space(date);
        cleanup_space(email);
        cleanup_space(sub);
        printf("Author: %s\nEmail: %s\nSubject: %s\nDate: %s\n\n", name, email, sub, date);
-       FILE *out = cmitmsg;
 
        do {
                if (!memcmp("diff -", line, 6) ||