[Libreoffice-commits] core.git: logerrit

[Mike Kaganski (via logerrit)]

 logerrit |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 34d58fb8e870b9c817e8d79b749297f4509dcb52
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Sun Mar 14 12:41:22 2021 +0300
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Sun Mar 14 12:32:22 2021 +0100

    Cygwin/MINGW also use '--date'
    
    Change-Id: Icd0ad5e304d8479a56552dc8ff00b3bddab0ecf6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112466
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/logerrit b/logerrit
index 35a454c9267f..44236b07749a 100755
--- a/logerrit
+++ b/logerrit
@@ -24,9 +24,8 @@ submit() {
         fi
 
         if [ "$BRANCH" = "master" ]; then
-            if [[ "$(uname)" == *Linux* ]]; then
-                WEEKOLDDATE=$(date --date="7 days ago" +%s)
-            else
+            WEEKOLDDATE=$(date --date="7 days ago" +%s 2> /dev/null)
+            if [ "$WEEKOLDDATE" = "" ]; then
                 WEEKOLDDATE=$(date -v7d +%s) # BSD equivalent
             fi
             PARENTDATE=$(git show -s --format=%ct HEAD~1)