worktree: rename is_worktree_locked to worktree_lock_reason

diff --git a/builtin/grep.c b/builtin/grep.c
index 0c3527242eb052810b4d6487954d241f16d4860d..d8508ddf792dd22dc0c8c283df29e5e6d9dacbf7 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -812,6 +812,8 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
                        GREP_BINARY_NOMATCH),
                OPT_BOOL(0, "textconv", &opt.allow_textconv,
                         N_("process binary files with textconv filters")),
+               OPT_SET_INT('r', "recursive", &opt.max_depth,
+                           N_("search in subdirectories (default)"), -1),
                { OPTION_INTEGER, 0, "max-depth", &opt.max_depth, N_("depth"),
                        N_("descend at most <depth> levels"), PARSE_OPT_NONEG,
                        NULL, 1 },