[Libreoffice-commits] core.git: Branch 'libreoffice-5-3-0' - bin/lo-pack-sources

[Christian Lohmaier]

 bin/lo-pack-sources |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e901e564d4cd177d39645ddc90e4a27ee9ccc8a8
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Tue Jan 17 19:50:33 2017 +0100

    making portable sed statements is not worth the hassle
    
    change to git's own formatting capabilities by using the text-wrap
    option with only indent settings/no rewrapping → %w(0,8,8)
    and also omit the additional empty line when there only is a summary,
    but no body in the commit message (remove a %n, make it %+b)
    finally drop the now no-longer needed starmarker (the @)
    
    previous differences in sed caused unnecessarily large diffs for
    distro-packagers, see
    https://anonscm.debian.org/git/pkg-openoffice/libreoffice-dictionaries.git/commit/?h=upstream&id=3dceac52f75030e87519e73b42babde51e471d9f
    now it will change once, but then we can put all the blame on git :-)
    
    Change-Id: Ifa719d062582c54c9c23b4ae08d4bae9a396e83c
    (cherry picked from commit 562edf0f09ba4e82fb9186aa75ee88fd7f68d18f)
    (cherry picked from commit 767695be0e6cce551ae661ba741694d48695def1)

diff --git a/bin/lo-pack-sources b/bin/lo-pack-sources
index 87e3650..d43b71b 100755
--- a/bin/lo-pack-sources
+++ b/bin/lo-pack-sources
@@ -126,8 +126,8 @@ sub generate_lo_module_changelog($$$)
     $log_name .= "-$module_dirname{$module}" if ($module_dirname{$module});
     print "Generating changelog for $module...\n";
     system ("cd $source_dir/$module_dirname{$module} && " .
-            "git log --date=short --pretty='format:@%cd  %an  <%ae>  [%H]%n%n%s%n%n%e%b' | " .
-            "  sed -e 's/^/\t/' -e 's/^\t@//' >$lo_module_release_topdir/$log_name" ) &&
+            "git log --date=short --pretty='format:%cd  %an  <%ae>  [%H]%n%n%w(0,8,8)%s%n%e%+b' | " .
+            ">$lo_module_release_topdir/$log_name" ) &&
         die "Error: generating failed: $!\n";
 }