From 608403d7a522adb3f8c0244956a332ed1b286668 Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Wed, 29 Aug 2007 21:56:56 -0400 Subject: Make git-archimport log entries more consistent When appending the "git-archimport-id:" line to the end of log entries, git-archimport would use two blank lines as a separator when there was no body in the arch log (only a Summary: line), and zero blank lines when there was a body (making it hard to see the break between the actual log message and the git-archimport-id: line). This patch makes git-archimport generate one blank line as a separator in all cases. Signed-off-by: Junio C Hamano --- git-archimport.perl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/git-archimport.perl b/git-archimport.perl index b21077206a..9a7a90640f 100755 --- a/git-archimport.perl +++ b/git-archimport.perl @@ -595,7 +595,11 @@ foreach my $ps (@psets) { 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"; -- cgit v1.2.3