From b1028f1399dc471db8f777cec6182b5d9a456541 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Wed, 18 Jan 2012 08:45:29 +0100 Subject: [PATCH] gitlog-to-changelog: use "||", not "or" in expressions * build-aux/gitlog-to-changelog (main): Use "||", not "or" in expressions. --- ChangeLog | 6 ++++++ build-aux/gitlog-to-changelog | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index b225cf120..c7bee9175 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-01-18 Jim Meyering + + gitlog-to-changelog: use "||", not "or" in expressions + * build-aux/gitlog-to-changelog (main): Use "||", not "or" in + expressions. + 2012-01-17 Joel E. Denny gitlog-to-changelog: new option --no-cluster diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog index 61edde1e3..099ecdd4c 100755 --- a/build-aux/gitlog-to-changelog +++ b/build-aux/gitlog-to-changelog @@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}' if 0; # Convert git log output to ChangeLog format. -my $VERSION = '2012-01-17 21:54'; # UTC +my $VERSION = '2012-01-18 07:44'; # UTC # The definition above must lie within the first 8 lines in order # for the Emacs time-stamp write hook (at end) to update it. # If you change this file with Emacs, please let the write hook @@ -313,10 +313,10 @@ sub parse_amend_file($) # or if this or the previous entry consists of two or more paragraphs, # then print the header. if ($no_cluster - or $date_line ne $prev_date_line - or "@coauthors" ne "@prev_coauthors" - or $multi_paragraph - or $prev_multi_paragraph) + || $date_line ne $prev_date_line + || "@coauthors" ne "@prev_coauthors" + || $multi_paragraph + || $prev_multi_paragraph) { $prev_date_line eq '' or print "\n"; -- 2.11.0