X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=update_spamassassin;h=219a537cb386f00e7fc4f329c954f65e450bec38;hp=d432ad79d97f4d313426c28e9a1a0d5aeae3e805;hb=8cef733f4d4bf5622a6fe85ee899d9e02a231ad8;hpb=cec3189bc84e6071855cf0157c434fa23a704262 diff --git a/update_spamassassin b/update_spamassassin index d432ad7..219a537 100755 --- a/update_spamassassin +++ b/update_spamassassin @@ -36,7 +36,7 @@ remove_pidfile() { 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";