Christian Mauderer commented on a discussion: https://gitlab.rtems.org/rtems/rtos/rtems/-/merge_requests/1115#note_146148 The command that fails tells that there is a commit not in the working tree. I think the pipelines are just not expecting that many commits. The pipeline only fetches 50 commits due to the variable [here](https://gitlab.rtems.org/administration/integration/-/blob/main/ci/config/variables.yml?ref_type=heads#L4). The job would have to check 278 commits. I put the commands from the `merge-commit` stage of the pipeline into a script: [commit-check.sh](/uploads/218f71a7219c8acfc7e16d34776bdf86/commit-check.sh) On my system it runs if I compare Sebastians spec-v4 branch with the current upstream/main: ./commit-check.sh rtemsorg_sebastian/spec-v4 upstream/main > merge-commits.txt That results in this output [merge-commits.txt](/uploads/ebff8da2f51d0659a6030db918760385/merge-commits.txt). So the checker seems to be happy. The other stage that is failing is the `format` stage. The problematic error is the fatal: bad object 5a16f9dd505134421507cd493c28ffa665e97f48 I'm relatively sure that this is again due to the 50 commit limit. Unfortunately, that stage is a bit more complex and can't easily be converted into a shell script. I think there are only two solutions to make that step happy: 1. Combine all commits (which would lose the history of the files from rtems-central) 2. Split up the merge request into about 6 smaller ones. I think losing the history is not a good solution. So I would suggest the second option. But maybe that should be done after it is clear whether the general direction of the merge request is OK (importing this kind of spec from rtems-central into RTEMS). Otherwise, it would split up the discussion into multiple merge requests. What do you think? -- View it on GitLab: https://gitlab.rtems.org/rtems/rtos/rtems/-/merge_requests/1115#note_146148 You're receiving this email because of your account on gitlab.rtems.org.
_______________________________________________ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
