• Jeff King's avatar
    standardize and improve lookup rules for external local repos · b3256eb8
    Jeff King authored
    When you specify a local repository on the command line of
    clone, ls-remote, upload-pack, receive-pack, or upload-archive,
    or in a request to git-daemon, we perform a little bit of
    lookup magic, doing things like looking in working trees for
    .git directories and appending ".git" for bare repos.
    For clone, this magic happens in get_repo_path. For
    everything else, it happens in enter_repo. In both cases,
    there are some ambiguous or confusing cases that aren't
    handled well, and there is one case that is not handled the
    same by both methods.
    This patch tries to provide (and test!) standard, sensible
    lookup rules for both code paths. The intended changes are:
      1. When looking up "foo", we have always preferred
         a working tree "foo" (containing "foo/.git" over the
         bare "foo.git". But we did not prefer a bare "foo" over
         "foo.git". With this patch, we do so.
      2. We would select directories that existed but didn't
         actually look like git repositories. With this patch,
         we make sure a selected directory looks like a git
         repo. Not only is this more sensible in general, but it
         will help anybody who is negatively affected by change
         (1) negatively (e.g., if they had "foo.git" next to its
         separate work tree "foo", and expect to keep finding
         "foo.git" when they reference "foo").
      3. The enter_repo code path would, given "foo", look for
         "foo.git/.git" (i.e., do the ".git" append magic even
         for a repo with working tree). The clone code path did
         not; with this patch, they now behave the same.
    In the unlikely case of a working tree overlaying a bare
    repo (i.e., a ".git" directory _inside_ a bare repo), we
    continue to treat it as a working tree (prefering the
    "inner" .git over the bare repo). This is mainly because the
    combination seems nonsensical, and I'd rather stick with
    existing behavior on the off chance that somebody is relying
    on it.
    Signed-off-by: default avatarJeff King <peff@peff.net>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
cache.h 43.8 KB