whither merge-tree? (was: What's cooking in git.git (Feb 2016, #05; Wed, 17))

On Wed, Feb 17, 2016 at 02:34:08PM -0800, Junio C Hamano wrote: > * jk/merge-tree-merge-blobs (2016-02-16) 1 commit > - merge_blobs: use strbuf instead of manually-sized mmfile_t > > "git merge-tree" (a throw-away demonstration) did not work very > well when merging "both sides added a new fil

Re: What's cooking in git.git (Feb 2016, #05; Wed, 17)

Jeff King writes: > On Wed, Feb 17, 2016 at 02:34:08PM -0800, Junio C Hamano wrote: > >> * jk/tighten-alloc (2016-02-15) 18 commits >> ... > Please hold off a bit; I have a re-roll coming for this one. > >> * nd/dwim-wildcards-as-pathspecs (2016-02-10) 3 commits >> ... > Even if we drop it, I thi

Re: What's cooking in git.git (Feb 2016, #05; Wed, 17)

On Wed, Feb 17, 2016 at 02:34:08PM -0800, Junio C Hamano wrote: > * jk/tighten-alloc (2016-02-15) 18 commits > - ewah: convert to REALLOC_ARRAY, etc > - convert ewah/bitmap code to use xmalloc > - diff_populate_gitlink: use a strbuf > - transport_anonymize_url: use xstrfmt > - git-compat-util

What's cooking in git.git (Feb 2016, #05; Wed, 17)

Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. There are a few undecided topics a