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

diff --git a/update_spamassassin b/update_spamassassin
index d432ad7..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";
@@ -84,7 +84,7 @@ 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":
+cd "$SACONFIG";
 git merge --ff-only  --quiet $REMOTE_BRANCH --;
 trap - 0
 remove_pidfile