From: Don Armstrong Date: Fri, 11 Nov 2016 16:42:30 +0000 (-0800) Subject: fix colon typo X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=commitdiff_plain;h=e764aa19c66099a3802bc829a3cf5b612a62f0da fix colon typo --- diff --git a/update_spamassassin b/update_spamassassin index 219a537..c5d9629 100755 --- a/update_spamassassin +++ b/update_spamassassin @@ -84,7 +84,7 @@ if ! spamassassin -p $TMPDIR/spamassassin_config/$USERCONF --lint > $TMPDIR/sa_l 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