On Sat, Apr 15, 2017 at 5:14 PM, Junio C Hamano <gits...@pobox.com> wrote: > * nd/conditional-config-include (2017-04-14) 2 commits > - config: resolve symlinks in conditional include's patterns > - path.c: and an option to call real_path() in expand_user_path() >
$GIT_DIR may in some cases be normalized with all symlinks resolved while "gitdir" path expansion in the pattern does not receive the same treatment. This may lead to incorrect mismatch. > * nd/worktree-add-lock (2017-04-15) 2 commits > - SQUASH??? > - worktree add: add --lock option > Allow to lock a workktree immediately after it's created. This helps prevent a race between "git worktree add; git worktree lock" and "git worktree prune". -- Duy
