tree fdc63c9e33954d77aa5299e0fb02e1cba49a01cc
parent f9db0c055c2f93021ee32a069e15b9e54f39f0da
parent 4f03666ac69ec4799998f010d04916c12e38edf8
author Junio C Hamano <gitster@pobox.com> 1477605528 -0700
committer Junio C Hamano <gitster@pobox.com> 1477605528 -0700

Merge branch 'jk/no-looking-at-dotgit-outside-repo'

Update "git diff --no-index" codepath not to try to peek into .git/
directory that happens to be under the current directory, when we
know we are operating outside any repository.

* jk/no-looking-at-dotgit-outside-repo:
  diff: handle sha1 abbreviations outside of repository
  diff_aligned_abbrev: use "struct oid"
  diff_unique_abbrev: rename to diff_aligned_abbrev
  find_unique_abbrev: use 4-buffer ring
  test-*-cache-tree: setup git dir
  read info/{attributes,exclude} only when in repository