OLDDIR="$(pwd)";
cd "$SACONFIG";
git fetch --all >/dev/null || exit 0;
-REMOTE_BRANCH="$(git status --porcelain --branch|grep '^##'|sed 's/.*\.\.\.//')";
+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";
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;
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"