Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
  builtin-fast-export: Only output a single parent per line

diff --combined builtin-fast-export.c
index e1c56303e5cb7882bc79980c4f8e6c6791ad323b,4bf5b58bfc22babdf382e9549d7f79dbdb4a3b56..4ab93fcf780c100f9af3bb6d4ddf3cbe86f73b3d
--- 1/builtin-fast-export.c
--- 2/builtin-fast-export.c
+++ b/builtin-fast-export.c
@@@ -196,7 -196,8 +196,7 @@@ static void handle_commit(struct commi
                          ? 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);
@@@ -204,14 -205,10 +204,10 @@@
                        continue;
                if (i == 0)
                        printf("from :%d\n", mark);
-               else if (i == 1)
-                       printf("merge :%d", mark);
                else
-                       printf(" :%d", mark);
+                       printf("merge :%d\n", mark);
                i++;
        }
-       if (i > 1)
-               printf("\n");
  
        log_tree_diff_flush(rev);
        rev->diffopt.output_format = saved_output_format;
@@@ -382,8 -379,7 +378,8 @@@ int cmd_fast_export(int argc, const cha
  
        get_tags_and_duplicates(&revs.pending, &extra_refs);
  
 -      prepare_revision_walk(&revs);
 +      if (prepare_revision_walk(&revs))
 +              die("revision walk setup failed");
        revs.diffopt.format_callback = show_filemodify;
        DIFF_OPT_SET(&revs.diffopt, RECURSIVE);
        while ((commit = get_revision(&revs))) {