From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 10 Nov 2019 09:02:14 +0000 (+0900)
Subject: Merge branch 'sg/dir-trie-fixes'
X-Git-Tag: v2.25.0-rc0~141
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=db806d7064ee132c2dbb3d36d26da9adb5066260;p=thirdparty%2Fgit.git

Merge branch 'sg/dir-trie-fixes'

Code clean-up and a bugfix in the logic used to tell worktree local
and repository global refs apart.

* sg/dir-trie-fixes:
  path.c: don't call the match function without value in trie_find()
  path.c: clarify two field names in 'struct common_dir'
  path.c: mark 'logs/HEAD' in 'common_list' as file
  path.c: clarify trie_find()'s in-code comment
  Documentation: mention more worktree-specific exceptions
---

db806d7064ee132c2dbb3d36d26da9adb5066260