[FS-11338] Fix git commits with multiple authors Created: 20/Aug/18 Updated: 24/Dec/18 Resolved: 22/Aug/18
|Reporter:||Dan Jenkins||Assignee:||Mike Jerris|
|Remaining Estimate:||Not Specified|
|Time Spent:||Not Specified|
|Original Estimate:||Not Specified|
|FreeSWITCH GIT Revision:||master|
|GIT Master Revision hash::||master|
I can't push code up to github because github runs checks on the git history.
There are two commits which contain two authors
Checking object directories: 100% (256/256), done.
error in commit 487128950df6ee433c131b5feaafe81ee86629f4: multipleAuthors: invalid format - multiple 'author' lines
error in commit 8574988c3a378b4d5861ecaeb0e958657635703b: multipleAuthors: invalid format - multiple 'author' lines
Checking objects: 100% (307936/307936), done.
dangling blob ca8e65ad0ac3b884f4f5f8c8b0aecb576a9c42e0
Git rules state you can't have multiple authors and the correct way to do this is to have a co-author - https://help.github.com/articles/creating-a-commit-with-multiple-authors/
This stops people being able to use github to share code (such as the a-frame code I used at cluecon 2018) or working on freeswitch on github forks before contributing it back.
Can we get the two offending commits fixed?
|Comment by Mike Jerris [ 22/Aug/18 ]|
|we can't fix that without rewriting all history, which will change all git commit history and revs.|
|Comment by Dan Jenkins [ 23/Aug/18 ]|
No discussion? Surely there is something that can be done? Surely we could see if people are open to the idea - it completely rules out having a working version hosted on GitHub which is where 99% of developers put things - I don't have access to push up to the freeswitch stash. So instead of pushing code to share with others to my organisation on github I have to create an account on bitbucket or gitlab or something.... What happens when stash/bitbucket/gitlab all start following the rules too?
I honestly think its worth rewriting the history. Its not difficult to then do a rebase. This is quite frankly ridiculous and hurts the project. I'll be fixing the commits and pushing to github - shame that means that I'll never be able to commit any of the code back to the project.
|Comment by zhuo ren liu [ 24/Dec/18 ]|
I also meet this problem,
I use git rebase fork new master v1.2 v1.4 v1.6 v1.8 branch.
I had push to my github, https://github.com/foobarren/freeswitch