From adf037c44c798b366b90e047bc62c40b72a883f2 Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Sun, 20 Jan 2019 23:41:37 -0500 Subject: [PATCH] Complete and remove todo from bump_version --- bump_version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bump_version b/bump_version index 06a690e195..f0917ad65e 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}" \