MISP / misp-objects

Definition, description and relationship types of MISP objects
https://www.misp-project.org/objects.html
Other
91 stars 118 forks source link

MISP submodules error when trying to update #389

Closed expl0it0473 closed 1 year ago

expl0it0473 commented 1 year ago

When I try to update submodules I get this error

[root@ MISP]# git submodule update --init --recursive fatal: detected dubious ownership in repository at '/data/MISP' To add an exception for this directory, call: git config --global --add safe.directory /data/MISP

However if i implement this solution (git config --global --add safe.directory /data/MISP) the submodules are no longer displayed in the GUI.

When I try the same command as the user Apache I get this long error list....Any solutions?

`[root@ MISP]# sudo -u apache git submodule update --init --recursive error: Your local changes to the following files would be overwritten by checkout: README.md Please commit your changes or stash them before you switch branches. Aborting fatal: Unable to checkout '059b669d9a8304f197740eace9d2f26e9dcde680' in submodule path 'PyMISP/pymisp/data/misp-objects' fatal: Failed to recurse into submodule path 'PyMISP' README.md: needs merge clusters/android.json: needs merge clusters/backdoor.json: needs merge clusters/banker.json: needs merge clusters/botnet.json: needs merge clusters/malpedia.json: needs merge clusters/microsoft-activity-group.json: needs merge clusters/mitre-attack-pattern.json: needs merge clusters/mitre-course-of-action.json: needs merge clusters/mitre-intrusion-set.json: needs merge clusters/mitre-malware.json: needs merge clusters/mitre-tool.json: needs merge clusters/ransomware.json: needs merge clusters/rat.json: needs merge clusters/stealer.json: needs merge clusters/threat-actor.json: needs merge clusters/tool.json: needs merge tools/adoc_galaxy.py: needs merge error: you need to resolve your current index first fatal: Unable to checkout '79b80b0869e57dc14861c0c30792f64a243ecb3b' in submodule path 'app/files/misp-galaxy' README.md: needs merge objects/domain-ip/definition.json: needs merge objects/fail2ban/definition.json: needs merge objects/mactime-timeline-analysis/definition.json: needs merge objects/network-connection/definition.json: needs merge objects/person/definition.json: needs merge objects/report/definition.json: needs merge objects/yara/definition.json: needs merge relationships/definition.json: needs merge error: you need to resolve your current index first fatal: Unable to checkout '059b669d9a8304f197740eace9d2f26e9dcde680' in submodule path 'app/files/misp-objects' remote: Enumerating objects: 1131, done. remote: Counting objects: 100% (1131/1131), done. remote: Compressing objects: 100% (365/365), done. remote: Total 1131 (delta 838), reused 1053 (delta 764), pack-reused 0 Receiving objects: 100% (1131/1131), 1.09 MiB | 7.29 MiB/s, done. Resolving deltas: 100% (838/838), completed with 8 local objects. From https://github.com/misp/misp-stix ede9bc7..f77275a dev -> origin/dev 93da9ae..eab1b78 main -> origin/main

adulau commented 1 year ago

It seems your git repository is a fork on a different branch and need some merges, Not related to MISP objects.