From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 27 Oct 2020 22:09:47 +0000 (-0700)
Subject: Merge branch 'rs/worktree-list-show-locked'
X-Git-Tag: v2.30.0-rc0~155
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=26bb5437f6defed72996b6a2bb1ff9121ec297ff;p=thirdparty%2Fgit.git

Merge branch 'rs/worktree-list-show-locked'

"git worktree list" now shows if each worktree is locked.  This
possibly may open us to show other kinds of states in the future.

* rs/worktree-list-show-locked:
  worktree: teach `list` to annotate locked worktree
---

26bb5437f6defed72996b6a2bb1ff9121ec297ff