compat: Add simplified merge sort implementation from glibc

diff --git a/git-archimport.perl b/git-archimport.perl
index b21077206a93139fd8652d5174817e18c89ba22e..9a7a90640fa02eef50c522d4276616bae006e6fe 100755 (executable)
--- a/git-archimport.perl
+++ b/git-archimport.perl
@@ -595,7 +595,11 @@ sub process_patchset_fast {
     my $pid = open2(*READER, *WRITER,'git-commit-tree',$tree,@par)
         or die $!;
     print WRITER $ps->{summary},"\n\n";
-    print WRITER $ps->{message},"\n";
+
+    # only print message if it's not empty, to avoid a spurious blank line;
+    # also append an extra newline, so there's a blank line before the
+    # following "git-archimport-id:" line.
+    print WRITER $ps->{message},"\n\n" if ($ps->{message} ne "");
 
     # make it easy to backtrack and figure out which Arch revision this was:
     print WRITER 'git-archimport-id: ',$ps->{id},"\n";