X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=update_spamassassin;h=609e8f88f54ed8b3849133f396cfec784df49664;hp=a8000ab2682f1e5d537d5dfc55001882670272f7;hb=bfc723630de2173b3c9f7cd434972b40dc4d89fd;hpb=095548a1c0a79b17024a2bb0343907ed922597af

diff --git a/update_spamassassin b/update_spamassassin
index a8000ab..609e8f8 100755
--- a/update_spamassassin
+++ b/update_spamassassin
@@ -35,8 +35,8 @@ remove_pidfile() {
 
 OLDDIR="$(pwd)";
 cd "$SACONFIG";
-git fetch --all >/dev/null || exit 0;
-REMOTE_BRANCH="$(git status --porcelain --branch|grep '^##'|sed 's/.*\.\.\.//')";
+git fetch --quiet --all >/dev/null 2>&1 || exit 0;
+REMOTE_BRANCH="$(git status --porcelain --branch|grep '^##'|sed 's/.*\.\.\.//;s/ \[.*$//;')";
 CURRENT_HEAD="$(git rev-parse HEAD)"
 REMOTE_BRANCH_HEAD="$(git rev-parse "$REMOTE_BRANCH")"
 cd "$OLDDIR";
@@ -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;
@@ -84,8 +84,8 @@ if ! spamassassin -p $TMPDIR/spamassassin_config/$USERCONF --lint > $TMPDIR/sa_l
     FAILUREMESSAGE="$(echo -e 'spamassassin -p $TMPDIR/spamassassin_config/$USERCONF --lint\nfailed with\n'| cat - $TMPDIR/sa_lint)";
     report_failure
 fi;
-cd "$SACONFIG":
-git merge --ff-only $REMOTE_BRANCH --quiet;
+cd "$SACONFIG";
+git merge --ff-only  --quiet $REMOTE_BRANCH --;
 trap - 0
 remove_pidfile
 rm -rf "$TMPDIR"