> On 11 Oct 2014, at 09:29, David Aguilar <davvid@xxxxxxxxx> wrote: > > Thanks for the heads-up. > > I tested mergetool and it seems fine but indeed there's an > `if test -e "$GIT_DIR/MERGE_RR"` in there that is surely not > working as intended. > > One solution would be to move the work done in the test -z "$NONGIT_OK" > block in git-sh-setup into a function e.g. git_dir_init () so > that we can defer the GIT_DIR initialization until after > require_work_tree has been called. I believe I had a very similar idea but the vast number of things that would potentially be affected by changing git-sh-setup.sh made me put things on hold in case I had any other ideas. I haven't so I think this is probably the best approach.-- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html