Miklos Vajna <vmiklos@xxxxxxxxxxxxxx> writes: > On Mon, Aug 25, 2008 at 04:25:57PM +0200, Miklos Vajna <vmiklos@xxxxxxxxxxxxxx> wrote: >> It also takes care of subtree merge, output buffering, verbosity, and >> rename limits - these were global variables till now in >> merge-recursive.c. > > Actually subtree_merge was not used from the struct merge_options, here > is the fix. As bd1e8fe (merge-recursive: introduce merge_options, 2008-08-25) is not part of any solid integration branch yet, I'll squash this into it. In the longer term, I suspect that other file scope static variables in merge-recursive.c, such as call_depth, may want to move to merge_options, not as "option" but as "current state". But that is quite minor, as it only affects reentrancy, and I do not see a reason for merge_recursive() to be reentrant (yet). -- 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
