Fixes issue #613 (support for GPG signed commits on upstream repo) #614
Conversation
edvinassabaliauskas
force-pushed
the
issue/#613
branch
from
100c6e3 to
3e3a2ce
Compare
There was a problem hiding this comment.
Can you explain how this was effecting GPG signed commits? I am not able to see it.
There was a problem hiding this comment.
Yes, so the filter-branch is effectively rewriting all the commits even if there was no change made (no .gitrepo to remove). If filter encounters a merge commit (with more than one parent), continuing the filter on a second parent rewrites those commits. If commits are GPG signed during rewrite the signatures gets dropped which results in changed commit hash. This results in inability to push the branch to the remote, as local and remote histories do not match.
We actually want to remove .gitrepo files only from the newly created commits and not from the ones that are already on the remote.
I hope I've explained it clear enough 😃 It took me a while to understand what was happening with the commit rewriting.
Fixes #613