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";
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