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.
|
Hi @admorgan , I was encountering this exact issue and was extremely puzzled as to WHY two commits have exactly the same timestamp/message etc but with different SHA. It's only afte r seeing the raw commit info that it became apparent. Many thanks @edvinassabaliauskas for the fixes (can confirmed it works). Previously, Can we get this merged? I can share my info:
Notice how the local worktree had the signature removed, resulting in mismatch of the commit SHA |
|
@admorgan I was pulling my hair out trying to work out why I my subrepo pushes were failing and eventually worked out #613 was the issue. Using this PR allowed me to make the push I was after. Thanks @edvinassabaliauskas !!!! |
Limit the removal of .gitrepo files to commits on the repo hosting the subrepo. When using filter-branch and it encountered a merge commit, continuing the filter on the second branch rewrites all of those commits, despite that not being necessary for pre-commit. If the rewritten commits were GPG signed the change in the hash results in the inability to push to the remote repo. If during development you were to change to a different branch on the remote repo that contained a merge, you would not be able to push upstream because the rewrite would not match the upstream SHAs. fixes issue ingydotnet#613 fixes isseu ingydotnet#602
Fixes #613