From 78d7f09fff5d074f6c0917559d005e9a2a156be8 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Fri, 14 Nov 2014 12:09:45 +0000 Subject: [PATCH] Fix patch mangling with --inline option 2014-11-14 Tom de Vries * mklog: Move reading of .diff file up and add comment. Copy diff_lines to orig_diff_lines. Use orig_diff_lines when appending patch. From-SVN: r217558 --- contrib/ChangeLog | 5 +++++ contrib/mklog | 16 ++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 2484d86e20d8..60257c48e071 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,8 @@ +2014-11-14 Tom de Vries + + * mklog: Move reading of .diff file up and add comment. Copy diff_lines + to orig_diff_lines. Use orig_diff_lines when appending patch. + 2014-11-11 David Malcolm * ChangeLog.jit: New. diff --git a/contrib/mklog b/contrib/mklog index 8412d38fbf67..840f6f8c2663 100755 --- a/contrib/mklog +++ b/contrib/mklog @@ -132,15 +132,23 @@ sub is_top_level { return $function && $function !~ /^[\s{]/; } +# Read contents of .diff file +open (DFILE, $diff) or die "Could not open file $diff for reading"; +chomp (my @diff_lines = ); +close (DFILE); + +# Array diff_lines is modified by the log generation, so save a copy in +# orig_diff_lines if needed. +if ($inline) { + @orig_diff_lines = @diff_lines; +} + # For every file in the .diff print all the function names in ChangeLog # format. %cl_entries = (); $change_msg = undef; $look_for_funs = 0; $clname = get_clname(''); -open (DFILE, $diff) or die "Could not open file $diff for reading"; -chomp (my @diff_lines = ); -close (DFILE); $line_idx = 0; foreach (@diff_lines) { # Stop processing functions if we found a new file. @@ -313,7 +321,7 @@ foreach my $clname (keys %cl_entries) { if ($inline) { # Append the patch to the log - foreach (@diff_lines) { + foreach (@orig_diff_lines) { print OUTPUTFILE "$_\n"; } } -- 2.47.2