From 8cef733f4d4bf5622a6fe85ee899d9e02a231ad8 Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Fri, 11 Nov 2016 07:30:48 -0800 Subject: [PATCH] fix the sed for the remote branch --- update_spamassassin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"; -- 2.39.2