From: Junio C Hamano <redacted>
Date: Thu, 28 Jul 2016 17:34:41 +0000 (-0700)
Subject: Merge branch 'nd/worktree-lock'
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=2c608e0f7c1f0fb9fb3e42eb737d7b8543e11400;p=git.git

Merge branch 'nd/worktree-lock'

"git worktree prune" protected worktrees that are marked as
"locked" by creating a file in a known location.  "git worktree"
command learned a dedicated command pair to create and remove such
a file, so that the users do not have to do this with editor.

* nd/worktree-lock:
  worktree.c: find_worktree() search by path suffix
  worktree: add "unlock" command
  worktree: add "lock" command
  worktree.c: add is_worktree_locked()
  worktree.c: add is_main_worktree()
  worktree.c: add find_worktree()
---

2c608e0f7c1f0fb9fb3e42eb737d7b8543e11400