Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
  • Sign in
M
mjtest
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 1
    • Issues 1
    • List
    • Boards
    • Labels
    • Milestones
  • Merge Requests 0
    • Merge Requests 0
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • IPDSnelting
  • mjtest
  • Merge Requests
  • !3

Merged
Opened Jan 18, 2019 by uqdwn@uqdwn
  • Report abuse
Report abuse

fixup 558cba13: bump tests repo to published version

558cba13 broke submodule update --init:

git clone https://git.scc.kit.edu/IPDSnelting/mjtest.git && \
      cd mjtest && \
      git submodule update --init

Cloning into 'mjtest'...
remote: Enumerating objects: 788, done.
remote: Counting objects: 100% (788/788), done.
remote: Compressing objects: 100% (391/391), done.
remote: Total 788 (delta 437), reused 725 (delta 392)
Receiving objects: 100% (788/788), 162.16 KiB | 3.45 MiB/s, done.
Resolving deltas: 100% (437/437), done.
Submodule 'tests' (https://git.scc.kit.edu/IPDSnelting/mjtest-tests) registered for path 'tests'
Cloning into '/tmp/mjtest/tests'...
warning: redirecting to https://git.scc.kit.edu/IPDSnelting/mjtest-tests.git/
warning: redirecting to https://git.scc.kit.edu/IPDSnelting/mjtest-tests.git/
warning: redirecting to https://git.scc.kit.edu/IPDSnelting/mjtest-tests.git/
error: Server does not allow request for unadvertised object 78b27a109cb1a1a6bc6d3a6e0f57b5018305530c
Fetched in submodule path 'tests', but it did not contain 78b27a109cb1a1a6bc6d3a6e0f57b5018305530c. Direct fetching of that commit failed.

Check out, review, and merge locally

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

git fetch "https://git.scc.kit.edu/uqdwn/mjtest.git" "uqdwn/fix-submodule-checkout"
git checkout -b "uqdwn/mjtest-uqdwn/fix-submodule-checkout" 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 "uqdwn/mjtest-uqdwn/fix-submodule-checkout"

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.

  • Discussion 0
  • Commits 1
  • Changes 1
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: IPDSnelting/mjtest!3

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.