Naive attempt to fix badly formatted ChangeLog entries

Change-Id: I734df28b28addffa6a38e0e97dc7598abdaf6ceb

1 files changed, 11 insertions, 0 deletions

diff --git a/backflip b/backflip
index 625c8b3..aaa2c0e 100755
--- a/backflip
+++ b/backflip
@@ -96,6 +96,17 @@ forge_entry() {
     | grep ^+ \
     | sed -e '1d' -e 's:^+::' \
     | awk '$1 ~ /^2.*$/ {print "\t"$0}  $1 !~ /^2.*$/ {print $0}' > $FRAGFILE
+
+  # Try to fix ChangeLog format frequent issue when the same contributor
+  # commits 2 patches in a row.  Git diff messes up with the context and the
+  # regular first 2 lines of the entry (DATE  NAME  MAIL\n\n) ended at the
+  # bottom of the patch.
+  if ! head -n 1 $FRAGFILE | grep "<.*@.*>" \
+     && tail -n 2 $FRAGFILE | grep "<.*@.*>" > /dev/null; then
+    tail -n 2 $FRAGFILE > ${FRAGFILE}.tmp
+    head -n -2 $FRAGFILE >> ${FRAGFILE}.tmp
+    mv ${FRAGFILE}.tmp $FRAGFILE
+  fi
   print_info "${bold}Forged ChangeLog entry:${NC}"
   cat $FRAGFILE
   if $INTERACTIVE; then