Git mega squash用相同的消息和作者压缩所有顺序提交

Question

I have an application which monitors a file-system (TeamCity config directory), for changes to XML configuration files. When a change is detected, it is committed to Git (with libgit2sharp ). The Git 'Committer' is always the service account user that the application runs under, but the Git 'Author' is determined by examining the TeamCity audit log so that the change is attributed to the user who made it. The application records a generic commit message like "build configuration 'x' was modified by user 'y'." and commits the change.

Since TeamCity configuration changes tend to be made as a series of web page interactions, we end up with lots (10 to 30 or so) of sequential commits, showing the change to a given configuration file (generally, the same one (build-config) or two (vcs-config) files are changed in the whole series of commits).

I want to squash all sequential commits with the same commit message and author into a single commit. Is there a git command that can do this for a whole repo in one shot or do I need to script a sequence of calls for each sequence of commits that I want to squash?

When working with libgit2sharp, I have found that it makes sense to work out what I want to achieve in vanilla git and afterwards implement the git command in the c# code. but perhaps someone already knows the correct sequence of libgit2sharp calls to make this work.

Answer 1

I don't think it's ever been used to compress history before, but you could experiment with LibGit2Sharp's RewriteHistory api. Check out the tests for how it's usually invoked. Some combination of TreeFilter and ParentFilter might do what you want.