On Tue, Sep 24, 2019 at 04:25:45PM +0200, Johannes Schindelin wrote: > > I think it could make sense for merge-index to be able to directly run > > the merge-one-file code[1]. But I think we'd want to keep its ability to > > run an arbitrary script, and for people to call merge-one-file > > separately, since right now you can do: > > > > git merge-index my-script > > > > and have "my-script" do some processing of its own, then hand off more > > work to merge-one-file. > > Oh, sorry, I did not mean to say that we should do away with this at > all! Rather, I meant to say that `merge-index` could detect when it was > asked to run `git-merge-one-file` and re-route to internal code instead > of spawning a process. If any other script/program was specified, it > should be spawned off, just like it is done today. OK, great, then we are completely on the same page. :) -Peff
