diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-10-14 16:08:53 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-10-14 16:08:53 +0000 |
| commit | 8b39d6f93cc6f9aecc76d67a686087366c3c50fd (patch) | |
| tree | 39e31c70233a4702b479666dd1fcf23c1b5f19ba /rel | |
| parent | e3b4a3e96b2ffbc6d920155cd41687414045d4d6 (diff) | |
| parent | 17b8896c40fa1c4aaab96f82fd07d5f5f2698400 (diff) | |
| download | pleroma-8b39d6f93cc6f9aecc76d67a686087366c3c50fd.tar.gz | |
Merge branch 'master-to-stable' into 'develop'
Preparations for renaming `master` to `stable`
See merge request pleroma/pleroma!1840
Diffstat (limited to 'rel')
| -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 } |