Merge branch 'qq/maint'

* qq/maint:
mailinfo: feed the correct line length to decode_transfer_encoding()
git-clone: remove leftover debugging fprintf().

diff --git a/builtin-clone.c b/builtin-clone.c
index 643c7d41697868456c94f879bd3357b91744f4db..4a0f1ab8ac427e91f4efa1fa43c95a30ca256f11 100644 (file)
--- a/builtin-clone.c
+++ b/builtin-clone.c
@@ -421,7 +421,6 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
                die("could not create leading directories of '%s'", git_dir);
        set_git_dir(make_absolute_path(git_dir));
 
-       fprintf(stderr, "Initialize %s\n", git_dir);
        init_db(option_template, option_quiet ? INIT_DB_QUIET : 0);
 
        /*

diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
index 97c1ff97440ec107e336df774f86aadc28f26b89..fa6e8f90a4d54eb07f2af80620e35e617c94d605 100644 (file)
--- a/builtin-mailinfo.c
+++ b/builtin-mailinfo.c
@@ -812,6 +812,7 @@ static void handle_body(void)
                                              np - newline);
                        if (!handle_boundary())
                                return;
+                       len = strlen(line);
                }
 
                /* Unwrap transfer encoding */