-
Ticket
-
Resolution: Done
-
Normal
-
None
-
None
-
None
-
2
-
None
-
Testable
-
RHELBLD RelEng Sprint 117
The package rhc-worker-playbook appears to have divergent changes between the c9s and rhel-9-main branch.
Attempting to synchronize the rpms/rhc-worker-playbook branches using the clean pull mechanism.
Failed to perform a clean pull for rpms/rhc-worker-playbook, skipping.
Traceback (most recent call last):
File "/home/ckelley/git/osci/distrogitsync/lib/distrogitsync.py", line 600, in sync_repo_pull
repo.git.pull("--ff-only", "source", ref)
~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/usr/lib/python3.13/site-packages/git/cmd.py", line 736, in <lambda>
return lambda *args, **kwargs: self._call_process(name, *args, **kwargs)
~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^
File "/usr/lib/python3.13/site-packages/git/cmd.py", line 1316, in _call_process
return self.execute(call, **exec_kwargs)
~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^
File "/usr/lib/python3.13/site-packages/git/cmd.py", line 1111, in execute
raise GitCommandError(redacted_command, status, stderr_value, stdout_value)
git.exc.GitCommandError: Cmd('git') failed due to: exit code(128)
cmdline: git pull --ff-only source dbb32f3fc844cde4b56b4f1d6219dcc5aedd917d
stderr: 'From https://gitlab.com/redhat/centos-stream/rpms/rhc-worker-playbook
* branch dbb32f3fc844cde4b56b4f1d6219dcc5aedd917d -> FETCH_HEAD
hint: Diverging branches can't be fast-forwarded, you need to either:
hint:
hint: git merge --no-ff
hint:
hint: or:
hint:
hint: git rebase
hint:
hint: Disable this message with "git config advice.diverging false"
fatal: Not possible to fast-forward, aborting.'
Failed to sync pull repo for rpms/rhc-worker-playbook, skipping.
Chris recommends the following steps to fix the divergent branches:
- Store this commit in some backup branch: https://gitlab.com/redhat/centos-stream/rpms/rhc-worker-playbook/-/commit/dbb32f3fc844cde4b56b4f1d6219dcc5aedd917d
- Force-push the contents of rhel-9-main up into c9s, so they are identical.
- Push https://gitlab.com/redhat/centos-stream/rpms/rhc-worker-playbook/-/ /commit/dbb32f3fc844cde4b56b4f1d6219dcc5aedd917d back into c9s.
See OSCI-7846 for the findings.