On 02/04/17 04:38, Junio C Hamano wrote: > Ramsay Jones <ram...@ramsayjones.plus.com> writes: > >>> I am getting the impression that the files-backend thing as well as >>> this topic are ready for 'next'. Please stop me if I missed something >>> in these topics (especially the other one) that needs updating >>> before that happens. >> >> Hmm, are these branches 'tangled' with nd/prune-in-worktree? >> (I think they were at one point, but maybe not now?). > > Michael's mh/separate-ref-cache builds directly on top of > nd/files-backend-git-dir topic. > > nd/prune-in-worktree builds directly on top of > nd/worktree-kill-parse-ref, which in turn builds directly on top of > nd/files-backend-git-dir. > > In that sense, Michael's series and Duy's later two series are > "tangled" (i.e. shares some common commits that are still not in > 'master'). If nd/files-backend-git-dir that is shared among them is > ever rebased, all of them need to be rebased on top of it > consistently. > > But if either of nd/prune-in-worktree and nd/worktree-kill-parse-ref > needs to be rerolled, that can be done independently from Michael's > series, as long as nd/files-backend-git-dir is solid and unchanging.
I suspected as much (hence the 'maybe not now' comment), but I noticed that all four branches were merged into 'jch'. So, it seemed possible to me that they were all being considered for merging into next. Thanks! ATB, Ramsay Jones
