Merge tag 'post183-for-junio' of http://github.com/msysgit/git

diff --git a/builtin/commit.c b/builtin/commit.c
index 8e26a422a195196e084dc2bb49a65edff0aae8b4..1621dfcd4008fc5853fc078a32bf9eefb6c52023 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -704,7 +704,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
                        previous = eol;
                }
 
-               append_signoff(&sb, ignore_footer);
+               append_signoff(&sb, ignore_footer, 0);
        }
 
        if (fwrite(sb.buf, 1, sb.len, s->fp) < sb.len)
@@ -957,7 +957,7 @@ static const char *read_commit_message(const char *name)
        if (!commit)
                die(_("could not lookup commit %s"), name);
        out_enc = get_commit_output_encoding();
-       return logmsg_reencode(commit, out_enc);
+       return logmsg_reencode(commit, NULL, out_enc);
 }
 
 static int parse_and_validate_options(int argc, const char *argv[],