Re: q: faster way to integrate/merge lots of topic branches?
From: Ingo Molnar <hidden>
Date: 2016-06-15 22:45:00
* Ingo Molnar [off-list ref] wrote:
I have thought of using the last CommitDate of the topic branch and compare it with the last CommitDate of the master branch [and i can trust those values] - that would be a lot faster - but maybe i'm missing something trivial that makes that approach unworkable. It would also be nice to have a builtin shortcut for that instead of having to go via "git-log --pretty=fuller" to dump the CommitDate field.
hm, this method would be fragile if done purely within my integration script, as the timestamp of the head would have to be updated atomically, while always merging all the topic branches in one such transaction. (so that the timestamps do not get out of sync and a topic branch is not skipped by accident) So i guess it's better to just create a separate .git/refs/merge-cache/ hierarchy with timestamps of last merged branches and their head sha1 ... but maybe i'm banging on open doors? Ingo