Merge branch 'maint'

diff --git a/builtin-fast-export.c b/builtin-fast-export.c
index 4bd1356d50508efab81066e79abd7abcc1443627..e1c56303e5cb7882bc79980c4f8e6c6791ad323b 100755 (executable)
--- a/builtin-fast-export.c
+++ b/builtin-fast-export.c
@@ -196,8 +196,7 @@ static void handle_commit(struct commit *commit, struct rev_info *rev)
                          ? strlen(reencoded) : message
                          ? strlen(message) : 0),
               reencoded ? reencoded : message ? message : "");
-       if (reencoded)
-               free(reencoded);
+       free(reencoded);
 
        for (i = 0, p = commit->parents; p; p = p->next) {
                int mark = get_object_mark(&p->item->object);