Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
  • Sign in
S
scratchbox2
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Labels
  • Merge Requests 1
    • Merge Requests 1
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Jobs
  • Commits
  • mer-core
  • scratchbox2
  • Merge Requests
  • !42

Merged
Opened Dec 16, 2020 by Thaodan@Thaodan
  • Report abuse
Report abuse

Port to Lua >= 5.2

  • Overview 0
  • Commits 5
  • Changes 124
  • Switch from embedded lua to one provided by the system
  • Remove bundled Lua
  • Port to Lua >=5.2
  • Don't use deprecated table.maxn() in Lua
  • Use lua_pcall instead of lua_call to avoid SIGABRT when encountering Lua errors
Edited Dec 17, 2020 by Thaodan

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch "https://git.sailfishos.org/Thaodan/scratchbox2.git" "jb52528"
git checkout -b "Thaodan/scratchbox2-jb52528" FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout "origin/master"
git merge --no-ff "Thaodan/scratchbox2-jb52528"

Step 4. Push the result of the merge to GitLab

git push origin "master"

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: mer-core/scratchbox2!42

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.