Re: [PATCH] merge_blobs: use strbuf instead of manually-sized mmfile_t

On 2016-02-16 at 22:27 Junio C Hamano wrote: Three, I know the existence of the program is not more than "we could do something like this" illustration by Linus, and its output is in no way _designed_ to be so. We know today that it does not do Well, then it is just really sad that the

Re: [PATCH] merge_blobs: use strbuf instead of manually-sized mmfile_t

On 2016-02-16 at 21:35 Jeff King wrote: Yeah, I agree there isn't a great solution in git here. Using "git merge" is definitely wrong if you don't want to touch HEAD or have a working directory. If you _just_ care about doing the tree-level merge without content-level merging inside blobs, you

Re: [PATCH] merge_blobs: use strbuf instead of manually-sized mmfile_t

Jeff King writes: > Yeah, maybe. There were two reasons I avoided adding a test. > > One, I secretly hoped that by dragging my feet we could get consensus on > just ripping out merge-tree entirely. ;) > > Two, I'm not sure what the test output _should_ be. I think this case is >

Re: [PATCH] merge_blobs: use strbuf instead of manually-sized mmfile_t

On Tue, Feb 16, 2016 at 01:14:09PM +0100, Stefan Frühwirth wrote: > On 2016-02-16 at 06:50, Jeff King wrote: > >Yeah, maybe. There were two reasons I avoided adding a test. > > > >One, I secretly hoped that by dragging my feet we could get consensus on > >just ripping out merge-tree entirely. ;)

Re: [PATCH] merge_blobs: use strbuf instead of manually-sized mmfile_t

Thank you for working on this! Let me just address two things from an outsider's perspective: On 2016-02-16 at 06:50, Jeff King wrote: Yeah, maybe. There were two reasons I avoided adding a test. One, I secretly hoped that by dragging my feet we could get consensus on just ripping out

Re: [PATCH] merge_blobs: use strbuf instead of manually-sized mmfile_t

On Tue, Feb 16, 2016 at 12:09:15AM -0500, Eric Sunshine wrote: > > - ecb.priv = res; > > - return xdi_diff(f1, f2, , , ); > > + res->size = out.len; /* avoid long/size_t pointer mismatch below */ > > It took a minute or two for me to realize that "mismatch below" was > talking about the

Re: [PATCH] merge_blobs: use strbuf instead of manually-sized mmfile_t

On Mon, Feb 15, 2016 at 08:12:58PM -0500, Jeff King wrote: > On Mon, Feb 15, 2016 at 10:39:39PM +0100, Stefan Frühwirth wrote: > > in one specific circumstance, git-merge-tree exits with a segfault caused by > > "*** Error in `git': malloc(): memory corruption (fast)": > > > > There is a test

[PATCH] merge_blobs: use strbuf instead of manually-sized mmfile_t

On Mon, Feb 15, 2016 at 10:39:39PM +0100, Stefan Frühwirth wrote: > in one specific circumstance, git-merge-tree exits with a segfault caused by > "*** Error in `git': malloc(): memory corruption (fast)": > > There has to be at least one commit first (as far as I can tell it doesn't > matter