diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-10-18 10:24:29 +0200 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-10-18 10:24:29 +0200 |
| commit | 2473702be22a44070fcff439ac901f5b9bb0586a (patch) | |
| tree | 31b6180315fad80c41f551adf3ece4dcebf71f74 /rel/files/bin | |
| parent | 751513b6df0c76ad14026c70e1bf2635053bfea4 (diff) | |
| parent | 7511f3d192bff285d0ca22c03cd9a46fd552cdde (diff) | |
| download | pleroma-2473702be22a44070fcff439ac901f5b9bb0586a.tar.gz pleroma-2473702be22a44070fcff439ac901f5b9bb0586a.zip | |
Merge branch 'develop' into feature/relay-list
Diffstat (limited to 'rel/files/bin')
| -rwxr-xr-x | rel/files/bin/pleroma_ctl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rel/files/bin/pleroma_ctl b/rel/files/bin/pleroma_ctl index f767fe134..90f87a990 100755 --- a/rel/files/bin/pleroma_ctl +++ b/rel/files/bin/pleroma_ctl @@ -35,11 +35,11 @@ detect_branch() { if [ "$branch" = "develop" ]; then echo "develop" elif [ "$branch" = "" ]; then - echo "master" + echo "stable" else # Note: branch name in version is of SemVer format and may only contain [0-9a-zA-Z-] symbols — # if supporting releases for more branches, need to ensure they contain only these symbols. - echo "Releases are built only for master and develop branches" >&2 + echo "Can't detect the branch automatically, please specify it by using the --branch option." >&2 exit 1 fi } |