Thread (3 messages) flat view 3 messages, 2 authors, 2016-06-15

Re: git-svnimport failed and now git-repack hates me

From: Linus Torvalds <torvalds@osdl.org>
Date: 2016-06-15 22:42:47


On Fri, 5 Jan 2007, Junio C Hamano wrote:
I do not think we have too many branch refs (builtin-branch and
builtin-show-branch) for this patch to make any practical
difference
Yeah, it's mainly a "safety thing" - have the default be the "don't waste 
memory".
but I wonder why this is needed...
quoted
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).
"output_commit_title()" used it. Not just for the merge base, but for the 
regular "merging X and Y" messages, I think.

		Linus
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help