From: Don Armstrong <don@donarmstrong.com>
Date: Thu, 10 Nov 2016 17:02:18 +0000 (-0800)
Subject: move the --quiet option and use -- to indicate that $REMOTE_BRANCH isn't a file
X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=commitdiff_plain;h=cec3189bc84e6071855cf0157c434fa23a704262

move the --quiet option and use -- to indicate that $REMOTE_BRANCH isn't a file
---

diff --git a/update_spamassassin b/update_spamassassin
index a8000ab..d432ad7 100755
--- a/update_spamassassin
+++ b/update_spamassassin
@@ -75,7 +75,7 @@ EOF
 cp -ar $SACONFIG $TMPDIR/.;
 OLDDIR="$(pwd)";
 cd $TMPDIR/spamassassin_config;
-if ! git merge --quiet --ff-only $REMOTE_BRANCH; then
+if ! git merge --quiet --ff-only $REMOTE_BRANCH --; then
     FAILUREMESSAGE="The update from $REMOTE_BRANCH to $REMOTE_BRANCH_HEAD\nis not a fast-forward\n\n"
     report_failure;
 fi;
@@ -85,7 +85,7 @@ if ! spamassassin -p $TMPDIR/spamassassin_config/$USERCONF --lint > $TMPDIR/sa_l
     report_failure
 fi;
 cd "$SACONFIG":
-git merge --ff-only $REMOTE_BRANCH --quiet;
+git merge --ff-only  --quiet $REMOTE_BRANCH --;
 trap - 0
 remove_pidfile
 rm -rf "$TMPDIR"