After updating to 23.1.10 opnsense-code ports fails and I have no idea which solution I should take or if I can cleanup somehow:
root@OPNsense:~ # opnsense-code ports
remote: Enumerating objects: 30, done.
remote: Counting objects: 100% (30/30), done.
remote: Compressing objects: 100% (10/10), done.
remote: Total 30 (delta 15), reused 30 (delta 15), pack-reused 0
Unpacking objects: 100% (30/30), 2.91 KiB | 372.00 KiB/s, done.
From https://github.com/opnsense/tools
+ 44938d1...f57a81e master -> origin/master (forced update)
* [new tag] 23.1.10 -> 23.1.10
* [new tag] 23.1.9 -> 23.1.9
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint:
hint: git config pull.rebase false # merge
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
fatal: Need to specify how to reconcile divergent branches.
# opnsense-code -f tools
I had to fix a merge issue with a misplaced tag. Sorry about this.
Cheers,
Franco
I have a similar problem.
It started 2 weeks or so ago and I had planned to wait until after 23.7 to see if it fixed itself, but since this thread was started I will ask now.
sudo pkg update && sudo opnsense-code ports tools src ─╯
Updating OPNsense repository catalogue...
OPNsense repository is up to date.
Updating mimugmail repository catalogue...
mimugmail repository is up to date.
All repositories are up to date.
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint:
hint: git config pull.rebase false # merge
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
fatal: Need to specify how to reconcile divergent branches.
When I try the fix Franco suggests:
sudo opnsense-update -f tools ─╯
Usage: man opnsense-update
Is the root cause for my error different then stw, and that is why the opnsense-update command is saying check the man page?
Thanks in advance,
Sorry, same issue but I made a typo. It's opnsense-code.
Cheers,
Franco
I am still getting the same error for some reason:
sudo opnsense-code -f tools ─╯
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint:
hint: git config pull.rebase false # merge
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
fatal: Need to specify how to reconcile divergent branches.
Do you think there is something else going on?
I have not done anything really custom to the install and am using standard the community release type.
Thanks again,
Meh, there seems to be a more fundamental issue in opnsense-code with regard to automatic "tools" repo handling.
# rm -rf /usr/tools
This will do the trick and repair opnsense-code operation. It's what -f was supposed to do. ;)
Cheers,
Franco
That did the trick.
Thanks for the help Franco.