Merge branch 'nd/worktree-add-lock'
commite31159746e30a24d7064bf30491ccd73444eb00a
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Apr 2017 06:39:12 +0000 (26 15:39 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Apr 2017 06:39:12 +0000 (26 15:39 +0900)
tree4fc61f845670e28417a989d24fc37e7e91d645d3
parent7ba7bff6294153449453b27ebdcb2ad2e751736d
parent507e6e9eecce5e7a2cc204c844bbb2f9b17b31e3
Merge branch 'nd/worktree-add-lock'

Allow to lock a worktree immediately after it's created. This helps
prevent a race between "git worktree add; git worktree lock" and
"git worktree prune".

* nd/worktree-add-lock:
  worktree add: add --lock option
builtin/worktree.c