Merge branch 'QA_4_7'

1 files changed, 7 insertions, 0 deletions

diff --git a/scripts/create-release.sh b/scripts/create-release.sh
index b101c422aa..4baf86d1be 100755
--- a/scripts/create-release.sh
+++ b/scripts/create-release.sh
@@ -409,8 +409,15 @@ if [ $do_tag -eq 1 ] ; then
     echo "* Tagging release as $tagname"
     git tag -s -a -m "Released $version" $tagname $branch
     echo "   Dont forget to push tags using: git push --tags"
+    echo "* Cleanup of $branch"
+    # Remove composer.lock, but we need to create fresh worktree for that
+    git worktree add --force $workdir $branch
+    cd $workdir
     git rm --force composer.lock
     git commit -s -m "Removing composer.lock"
+    cd ../..
+    rm -rf $workdir
+    git worktree prune
 fi
 
 # Mark as stable release