On Mon, Jun 11, 2018 at 9:24 AM, Duy Nguyen <pclouds@xxxxxxxxx> wrote: >> I was just about to send you an email to ask if you were continuing on >> with the series. I need diff-lib.c converted in order to make the >> changes Junio suggested to index_has_changes at >> https://public-inbox.org/git/xmqqvaaz5jcv.fsf@xxxxxxxxxxxxxxxxxxxxxxxxx/. >> Since you're already working on that, I won't duplicate your effort. >> Thanks for tackling all of this. :-) > > I'm not sure if it's possible to cherry pick this patch to continue > your work (because of dependencies between patches) but it's > https://gitlab.com/pclouds/git/commits/really-kill-the-index, commit > "merge.c: remove...". > > Or you just leave it to me, update has_index_changes() to always take > 'struct index_state *' and just pass &the_index in all uninteresting > places. (Or not update at all if it's really not needed for your work) Actually, I'm thinking maybe I should just push that series forward without changing index_has_changes() to take an istate (since it's not actually important to that series yet), and then once your changes land, then update the function appropriately. (Or maybe your series will update that function too.) > What about merge-recursive.c? Given that this whole thing will take > many release cycles to finish, your work may get merged before mine > and I could do the conversion now (and resolve conflicts and resubmit > later). Of course if you like to keep merge-recursive.c the_index-free > now, I will not stop you ;-) I was just worried that since I was making changes in merge-recursive.c that it'd cause you conflict pain, so I offered to convert it. If that pain doesn't bother you, feel free to do the conversion and we'll just work through the minor conflicts as we go. Besides, sounds like you've converted nearly all of git, so it may make sense to just keep it together in one big series.
