diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-10-14 16:47:27 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-10-14 16:47:27 +0000 |
| commit | 13966f150469e2e7b6e02ffc8a7ab65b7c7bfaa7 (patch) | |
| tree | e3a284e6613f2b984617c811705005e373bbf74e /rel/files/bin | |
| parent | 1f99abbeba88f852e02ac784d0ce7309785f3387 (diff) | |
| parent | 2b6cd10b68c01bb16f94c911da6fce51511a1a5a (diff) | |
| download | pleroma-13966f150469e2e7b6e02ffc8a7ab65b7c7bfaa7.tar.gz pleroma-13966f150469e2e7b6e02ffc8a7ab65b7c7bfaa7.zip | |
Merge branch 'backport/1.1-branch-name-change' into 'maint/1.1'
Backport/1.1 branch name change
See merge request pleroma/pleroma!1841
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 } |