[v9_10] recent_changes script could terminate too early

(cherry picked from commit 58502352f20caf2c9363ca8c4f7dbe141bd98e98)

diff --git a/OPTIONS b/OPTIONS
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/util/recent_changes.sh b/util/recent_changes.sh
index 729559557f7f2f70fa57f0420c0251b78e74c0ed..7963212aa517e108819d1c02d0b724549308a0eb 100644 (file)
--- a/util/recent_changes.sh
+++ b/util/recent_changes.sh
@@ -14,18 +14,15 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id$
-
 # Find the list of files that have been touched in the Git repository
 # during the current calendar year.  This is done by walking backwards
 # through the output of "git whatchanged" until a year other than the
 # current one is seen.  Used by merge_copyrights.
 
 thisyear=`date +%Y`
-git whatchanged --pretty="date %ai" --date=iso8601 | awk -v re="${thisyear}-" '
+when="`expr $thisyear - 1`-12-31"
+git whatchanged --since="$when" --pretty="" | awk '
     BEGIN { change=0 }
-    $1 == "date" && $2 !~ re { exit(0); }
-    $1 == "date" { next; }
     NF == 0 { next; }
     $(NF-1) ~ /[AM]/ { print "./" $NF; change=1 }
     END { if (change) print "./COPYRIGHT" } ' | sort | uniq