I've got the following, possibly stupid question: is there a way to merge a healthy number of topic branches into the master branch in a quicker way, when most of the branches are already merged up? Right now i've got something like this scripted up: for B in $(git-branch | cut -c3- ); do git-merge $B; done It takes a lot of time to run on even a 3.45GHz box: real 0m53.228s user 0m41.134s sys 0m11.405s I just had a workflow incident where i forgot that this script was running in one window (53 seconds are a _long_ time to start doing some other stuff :-), i switched branches and the script merrily chugged away merging branches into a topic branch i did not intend. It iterates over 140 branches - but all of them are already merged up. Anyone can simulate it by switching to the linus/master branch of the current Linux kernel tree, and doing: time for ((i=0; i<140; i++)); do git-merge v2.6.26; done real 1m26.397s user 1m10.048s sys 0m13.944s One could argue that determining whether it's all merged up already is a complex task, but but even this seemingly trivial merge of HEAD into HEAD is quite slow: time for ((i=0; i<140; i++)); do git-merge HEAD; done real 0m17.871s user 0m8.977s sys 0m8.396s I'm wondering whether there are tricks to speed this up. The real script i'm using is much longer and obscured with boring details like errors, conflicts, etc. - but the above is the gist of it. (and that is what makes it slow primarily) Using a speculative Octopus might be one approach, but that runs into the octopus merge limitation at 24 branches, and it also is quite slow as well. (and is not equivalent to the serial merge of 140 branches) 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. builtin-integrate.c perhaps? ;-) Ingo -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
