Merge branch 'jk/git-dir-lookup' into maint

* jk/git-dir-lookup:
  standardize and improve lookup rules for external local repos

diff --cc builtin/clone.c
Simple merge

diff --cc cache.h
Simple merge