From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 28 Jul 2021 20:17:58 +0000 (-0700)
Subject: Merge branch 'sm/worktree-add-lock'
X-Git-Tag: v2.33.0-rc0~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=01369fdfd3d0deec41c55306dae42f00dfbfa582;p=thirdparty%2Fgit.git

Merge branch 'sm/worktree-add-lock'

"git worktree add --lock" learned to record why the worktree is
locked with a custom message.

* sm/worktree-add-lock:
  worktree: teach `add` to accept --reason <string> with --lock
  worktree: mark lock strings with `_()` for translation
  t2400: clean up '"add" worktree with lock' test
---

01369fdfd3d0deec41c55306dae42f00dfbfa582