Linus Torvalds <torvalds@xxxxxxxx> writes: > On Fri, 5 Jan 2007, Linus Torvalds wrote: >> >> Heh. Maybe we should just make the default the other way? It's probably >> pretty easy to find any users that suddenly start segfaulting ;) > > This seems to pass all the tests, at least. > > (But I didn't test the SVN stuff, since I don't have perl::SVN installed) I do not think we have too many branch refs (builtin-branch and builtin-show-branch) for this patch to make any practical difference, but I wonder why this is needed... > diff --git a/merge-recursive.c b/merge-recursive.c > index bac16f5..b98ed1a 100644 > --- a/merge-recursive.c > +++ b/merge-recursive.c > @@ -1286,6 +1286,7 @@ int main(int argc, char *argv[]) > const char *branch1, *branch2; > struct commit *result, *h1, *h2; > > + save_commit_buffer = 1; > git_config(git_default_config); /* core.filemode */ > original_index_file = getenv(INDEX_ENVIRONMENT); Ah, there are those annoying "using this as the merge base whose commit log is..." business. I wonder if anybody is actually reading them (I once considered squelching that output). - 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