aboutsummaryrefslogtreecommitdiff
path: root/bump_version
diff options
context:
space:
mode:
authorJoshua Boniface <joshua@boniface.me>2019-01-20 23:41:37 -0500
committerJoshua Boniface <joshua@boniface.me>2019-01-20 23:41:37 -0500
commitadf037c44c798b366b90e047bc62c40b72a883f2 (patch)
tree19d191f7d6f2e9c174b572ceff81d308a0f2885f /bump_version
parent73038ee3f72a5be4ebbe8e34c3f90bfb1648badb (diff)
Complete and remove todo from bump_version
Diffstat (limited to 'bump_version')
-rwxr-xr-xbump_version2
1 files changed, 1 insertions, 1 deletions
diff --git a/bump_version b/bump_version
index 06a690e19..f0917ad65 100755
--- a/bump_version
+++ b/bump_version
@@ -94,7 +94,7 @@ for repo in ./ MediaBrowser.WebDashboard/jellyfin-web/; do
pushd ${repo}
# Find the last release commit, so we know what's happened since
- last_master_branch="master-${old_version}" # TODO: Set to `release-` for next release, so we can properly parse both repos with the new branch standard
+ last_master_branch="release-${old_version}"
last_master_merge_commit="$(
git log --merges --pretty=oneline \
| grep -F "${last_master_branch}" \