]> git.donarmstrong.com Git - spamassassin_config.git/commitdiff
fix the sed for the remote branch
authorDon Armstrong <don@donarmstrong.com>
Fri, 11 Nov 2016 15:30:48 +0000 (07:30 -0800)
committerDon Armstrong <don@donarmstrong.com>
Fri, 11 Nov 2016 15:30:48 +0000 (07:30 -0800)
update_spamassassin

index d432ad79d97f4d313426c28e9a1a0d5aeae3e805..219a537cb386f00e7fc4f329c954f65e450bec38 100755 (executable)
@@ -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";