-
- Downloads
swarm: fix merge commit's validation after migration
Merge's commits were'nt checked, while comitting and while pulling. This means that the author could be incorrect. Add a check before doing a merge commit and when validating it. This avoid incorrect repository in case a merge commit is generated after a migration. Misc: fix incorrect test GitLab: #738 Change-Id: Id9748eb7d3dd5db023dd2ab4a30261c31af5d514
Showing
- src/jamidht/conversation.cpp 8 additions, 22 deletionssrc/jamidht/conversation.cpp
- src/jamidht/conversationrepository.cpp 30 additions, 3 deletionssrc/jamidht/conversationrepository.cpp
- src/jamidht/conversationrepository.h 9 additions, 1 deletionsrc/jamidht/conversationrepository.h
- test/unitTest/conversation/conversation.cpp 107 additions, 121 deletionstest/unitTest/conversation/conversation.cpp
- test/unitTest/syncHistory/syncHistory.cpp 10 additions, 27 deletionstest/unitTest/syncHistory/syncHistory.cpp
Loading
Please register or sign in to comment