From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
rethab.ch@gmail.com, rappazzo@gmail.com,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH v3 6/6] worktree: add "unlock" command
Date: Mon, 30 May 2016 17:49:39 +0700 [thread overview]
Message-ID: <20160530104939.28407-7-pclouds@gmail.com> (raw)
In-Reply-To: <20160530104939.28407-1-pclouds@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
Documentation/git-worktree.txt | 5 +++++
builtin/worktree.c | 28 ++++++++++++++++++++++++++++
contrib/completion/git-completion.bash | 2 +-
t/t2028-worktree-move.sh | 14 ++++++++++++++
4 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
index 6fca6cf..6a5ff47 100644
--- a/Documentation/git-worktree.txt
+++ b/Documentation/git-worktree.txt
@@ -13,6 +13,7 @@ SYNOPSIS
'git worktree list' [--porcelain]
'git worktree lock' [--reason <string>] <worktree>
'git worktree prune' [-n] [-v] [--expire <expire>]
+'git worktree unlock' <worktree>
DESCRIPTION
-----------
@@ -73,6 +74,10 @@ prune::
Prune working tree information in $GIT_DIR/worktrees.
+unlock::
+
+Unlock a worktree, allowing it to be pruned, moved or deleted.
+
OPTIONS
-------
diff --git a/builtin/worktree.c b/builtin/worktree.c
index 84fe63b..5fe9323 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -16,6 +16,7 @@ static const char * const worktree_usage[] = {
N_("git worktree list [<options>]"),
N_("git worktree lock [<options>] <path>"),
N_("git worktree prune [<options>]"),
+ N_("git worktree unlock <path>"),
NULL
};
@@ -495,6 +496,31 @@ static int lock_worktree(int ac, const char **av, const char *prefix)
return 0;
}
+static int unlock_worktree(int ac, const char **av, const char *prefix)
+{
+ struct option options[] = {
+ OPT_END()
+ };
+ struct worktree **worktrees, *wt;
+ int ret;
+
+ ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
+ if (ac != 1)
+ usage_with_options(worktree_usage, options);
+
+ worktrees = get_worktrees();
+ wt = find_worktree(worktrees, prefix, av[0]);
+ if (!wt)
+ die(_("'%s' is not a working directory"), av[0]);
+ if (is_main_worktree(wt))
+ die(_("'%s' is a main working directory"), av[0]);
+ if (!wt->lock_reason)
+ die(_("'%s' is not locked"), av[0]);
+ ret = unlink_or_warn(git_common_path("worktrees/%s/locked", wt->id));
+ free_worktrees(worktrees);
+ return ret;
+}
+
int cmd_worktree(int ac, const char **av, const char *prefix)
{
struct option options[] = {
@@ -513,5 +539,7 @@ int cmd_worktree(int ac, const char **av, const char *prefix)
return list(ac - 1, av + 1, prefix);
if (!strcmp(av[1], "lock"))
return lock_worktree(ac - 1, av + 1, prefix);
+ if (!strcmp(av[1], "unlock"))
+ return unlock_worktree(ac - 1, av + 1, prefix);
usage_with_options(worktree_usage, options);
}
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index f88727d..0e3841d 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2597,7 +2597,7 @@ _git_whatchanged ()
_git_worktree ()
{
- local subcommands="add list lock prune"
+ local subcommands="add list lock prune unlock"
local subcommand="$(__git_find_on_cmdline "$subcommands")"
if [ -z "$subcommand" ]; then
__gitcomp "$subcommands"
diff --git a/t/t2028-worktree-move.sh b/t/t2028-worktree-move.sh
index 87afc2e..68d3fe8 100755
--- a/t/t2028-worktree-move.sh
+++ b/t/t2028-worktree-move.sh
@@ -45,4 +45,18 @@ test_expect_success 'lock worktree twice (from the locked worktree)' '
test_cmp expected .git/worktrees/source/locked
'
+test_expect_success 'unlock main worktree' '
+ test_must_fail git worktree unlock .
+'
+
+test_expect_success 'unlock linked worktree' '
+ git worktree unlock source &&
+ test_path_is_missing .git/worktrees/source/locked
+'
+
+test_expect_success 'unlock worktree twice' '
+ test_must_fail git worktree unlock source &&
+ test_path_is_missing .git/worktrees/source/locked
+'
+
test_done
--
2.8.2.524.g6ff3d78
next prev parent reply other threads:[~2016-05-30 10:50 UTC|newest]
Thread overview: 162+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-15 13:53 possible to checkout same branch in different worktree Reto Hablützel
2016-04-15 15:36 ` Junio C Hamano
2016-04-16 0:51 ` Duy Nguyen
2016-04-17 12:59 ` [PATCH 0/7] fix checking out a being-rebased branch Nguyễn Thái Ngọc Duy
2016-04-17 12:59 ` [PATCH 1/7] path.c: add git_common_path() and strbuf_git_common_path() Nguyễn Thái Ngọc Duy
2016-04-17 12:59 ` [PATCH 2/7] worktree.c: store "id" instead of "git_dir" Nguyễn Thái Ngọc Duy
2016-04-17 12:59 ` [PATCH 3/7] path.c: refactor and add worktree_git_path() Nguyễn Thái Ngọc Duy
2016-04-17 12:59 ` [PATCH 4/7] worktree.c: add worktree_git_path_..._head() Nguyễn Thái Ngọc Duy
2016-04-17 12:59 ` [PATCH 5/7] wt-status.c: make wt_status_get_state() support worktree Nguyễn Thái Ngọc Duy
2016-04-17 12:59 ` [PATCH 6/7] worktree.c: avoid referencing to worktrees[i] multiple times Nguyễn Thái Ngọc Duy
2016-04-17 12:59 ` [PATCH 7/7] checkout: prevent checking out a branch being rebased in another worktree Nguyễn Thái Ngọc Duy
2016-04-18 17:42 ` [PATCH 0/7] fix checking out a being-rebased branch Junio C Hamano
2016-04-19 1:04 ` Duy Nguyen
2016-04-19 20:43 ` Junio C Hamano
2016-04-20 13:24 ` [PATCH v2 00/12] " Nguyễn Thái Ngọc Duy
2016-04-20 13:24 ` [PATCH v2 01/12] path.c: add git_common_path() and strbuf_git_common_path() Nguyễn Thái Ngọc Duy
2016-04-20 18:11 ` Eric Sunshine
2016-04-21 0:28 ` Duy Nguyen
2016-04-20 13:24 ` [PATCH v2 02/12] worktree.c: store "id" instead of "git_dir" Nguyễn Thái Ngọc Duy
2016-04-20 13:24 ` [PATCH v2 03/12] worktree.c: make find_shared_symref() return struct worktree * Nguyễn Thái Ngọc Duy
2016-04-20 17:05 ` Junio C Hamano
2016-04-21 7:02 ` Eric Sunshine
2016-04-20 13:24 ` [PATCH v2 04/12] worktree.c: mark current worktree Nguyễn Thái Ngọc Duy
2016-04-21 7:20 ` Eric Sunshine
2016-04-21 8:19 ` Duy Nguyen
2016-04-21 9:33 ` Duy Nguyen
2016-04-21 14:23 ` Eric Sunshine
2016-04-21 15:13 ` Jeff King
2016-04-21 15:37 ` Junio C Hamano
2016-04-21 15:40 ` Jeff King
2016-04-21 15:42 ` Junio C Hamano
2016-04-20 13:24 ` [PATCH v2 05/12] path.c: refactor and add worktree_git_path() Nguyễn Thái Ngọc Duy
2016-04-20 13:24 ` [PATCH v2 06/12] wt-status.c: split rebase detection out of wt_status_get_state() Nguyễn Thái Ngọc Duy
2016-04-20 13:48 ` Ramsay Jones
2016-04-20 13:54 ` Duy Nguyen
2016-04-20 13:24 ` [PATCH v2 07/12] wt-status.c: make wt_status_check_rebase() work on any worktree Nguyễn Thái Ngọc Duy
2016-04-20 13:24 ` [PATCH v2 08/12] worktree.c: avoid referencing to worktrees[i] multiple times Nguyễn Thái Ngọc Duy
2016-04-20 13:24 ` [PATCH v2 09/12] worktree.c: test if branch being rebased in another worktree Nguyễn Thái Ngọc Duy
2016-04-20 18:04 ` Junio C Hamano
2016-04-21 0:37 ` Duy Nguyen
2016-04-20 13:24 ` [PATCH v2 10/12] wt-status.c: split bisect detection out of wt_status_get_state() Nguyễn Thái Ngọc Duy
2016-04-20 13:24 ` [PATCH v2 11/12] worktree.c: test if branch being bisected in another worktree Nguyễn Thái Ngọc Duy
2016-04-20 13:24 ` [PATCH v2 12/12] branch: do not rename a branch under bisect or rebase Nguyễn Thái Ngọc Duy
2016-04-20 18:09 ` [PATCH v2 00/12] fix checking out a being-rebased branch Junio C Hamano
2016-04-22 13:01 ` [PATCH v3 00/13] nd/worktree-various-heads Nguyễn Thái Ngọc Duy
2016-04-22 13:01 ` [PATCH v3 01/13] dir.c: rename str(n)cmp_icase to fspath(n)cmp Nguyễn Thái Ngọc Duy
2016-04-22 13:01 ` [PATCH v3 02/13] path.c: add git_common_path() and strbuf_git_common_path() Nguyễn Thái Ngọc Duy
2016-04-22 13:01 ` [PATCH v3 03/13] worktree.c: store "id" instead of "git_dir" Nguyễn Thái Ngọc Duy
2016-04-22 13:01 ` [PATCH v3 04/13] worktree.c: make find_shared_symref() return struct worktree * Nguyễn Thái Ngọc Duy
2016-04-22 13:01 ` [PATCH v3 05/13] worktree.c: mark current worktree Nguyễn Thái Ngọc Duy
2016-05-06 7:51 ` Eric Sunshine
2016-05-06 10:21 ` Duy Nguyen
2016-05-10 14:14 ` Duy Nguyen
2016-05-10 14:15 ` [PATCH 1/7] completion: support git-worktree Nguyễn Thái Ngọc Duy
2016-05-10 14:15 ` [PATCH 2/7] worktree.c: rewrite mark_current_worktree() to avoid strbuf Nguyễn Thái Ngọc Duy
2016-05-11 6:16 ` Eric Sunshine
2016-05-10 14:15 ` [PATCH 3/7] git-worktree.txt: keep subcommand listing in alphabetical order Nguyễn Thái Ngọc Duy
2016-05-10 14:15 ` [PATCH 4/7] worktree.c: use is_dot_or_dotdot() Nguyễn Thái Ngọc Duy
2016-05-10 14:15 ` [PATCH 5/7] worktree.c: add clear_worktree() Nguyễn Thái Ngọc Duy
2016-05-11 6:36 ` Eric Sunshine
2016-05-11 6:42 ` Eric Sunshine
2016-05-22 8:58 ` Duy Nguyen
2016-05-10 14:15 ` [PATCH 6/7] worktree: avoid 0{40}, too many zeroes, hard to read Nguyễn Thái Ngọc Duy
2016-05-10 14:15 ` [PATCH 7/7] worktree: simplify prefixing paths Nguyễn Thái Ngọc Duy
2016-05-10 23:07 ` Junio C Hamano
2016-05-11 0:46 ` Duy Nguyen
2016-05-11 6:12 ` [PATCH 1/7] completion: support git-worktree Eric Sunshine
2016-05-10 14:17 ` [PATCH 1/5] worktree.c: add find_worktree_by_path() Nguyễn Thái Ngọc Duy
2016-05-10 14:17 ` [PATCH 2/5] worktree.c: add is_main_worktree() Nguyễn Thái Ngọc Duy
2016-05-13 16:32 ` Eric Sunshine
2016-05-10 14:17 ` [PATCH 3/5] worktree.c: add is_worktree_locked() Nguyễn Thái Ngọc Duy
2016-05-13 16:52 ` Eric Sunshine
2016-05-22 9:53 ` Duy Nguyen
2016-05-23 2:04 ` Eric Sunshine
2016-05-10 14:17 ` [PATCH 4/5] worktree: add "lock" command Nguyễn Thái Ngọc Duy
2016-05-16 0:09 ` Eric Sunshine
2016-05-22 10:31 ` Duy Nguyen
2016-05-23 4:21 ` Eric Sunshine
2016-05-16 0:40 ` Eric Sunshine
2016-05-10 14:17 ` [PATCH 5/5] worktree: add "unlock" command Nguyễn Thái Ngọc Duy
2016-05-16 0:42 ` Eric Sunshine
2016-05-13 16:29 ` [PATCH 1/5] worktree.c: add find_worktree_by_path() Eric Sunshine
2016-05-10 17:32 ` [PATCH v3 05/13] worktree.c: mark current worktree Junio C Hamano
2016-05-10 23:03 ` Junio C Hamano
2016-05-11 0:33 ` Duy Nguyen
2016-05-22 9:33 ` [PATCH v2 0/6] nd/worktree-cleanup-post-head-protection update Nguyễn Thái Ngọc Duy
2016-05-22 9:33 ` [PATCH v2 1/6] completion: support git-worktree Nguyễn Thái Ngọc Duy
2016-05-22 9:33 ` [PATCH v2 2/6] worktree.c: rewrite mark_current_worktree() to avoid strbuf Nguyễn Thái Ngọc Duy
2016-05-22 9:33 ` [PATCH v2 3/6] git-worktree.txt: keep subcommand listing in alphabetical order Nguyễn Thái Ngọc Duy
2016-05-22 9:33 ` [PATCH v2 4/6] worktree.c: use is_dot_or_dotdot() Nguyễn Thái Ngọc Duy
2016-05-22 9:33 ` [PATCH v2 5/6] worktree: avoid 0{40}, too many zeroes, hard to read Nguyễn Thái Ngọc Duy
2016-05-22 9:33 ` [PATCH v2 6/6] worktree: simplify prefixing paths Nguyễn Thái Ngọc Duy
2016-05-22 23:32 ` Eric Sunshine
2016-05-23 4:31 ` Eric Sunshine
2016-05-23 9:26 ` Duy Nguyen
2016-05-23 1:09 ` [PATCH v2 0/6] nd/worktree-cleanup-post-head-protection update Eric Sunshine
2016-05-22 10:43 ` [PATCH v2 0/5] worktree lock/unlock Nguyễn Thái Ngọc Duy
2016-05-22 10:43 ` [PATCH v2 1/5] worktree.c: add find_worktree_by_path() Nguyễn Thái Ngọc Duy
2016-05-23 1:41 ` Eric Sunshine
2016-05-23 4:11 ` Eric Sunshine
2016-05-30 9:56 ` Duy Nguyen
2016-05-22 10:43 ` [PATCH v2 2/5] worktree.c: add is_main_worktree() Nguyễn Thái Ngọc Duy
2016-05-22 10:43 ` [PATCH v2 3/5] worktree.c: add is_worktree_locked() Nguyễn Thái Ngọc Duy
2016-05-22 10:43 ` [PATCH v2 4/5] worktree: add "lock" command Nguyễn Thái Ngọc Duy
2016-05-23 4:36 ` Eric Sunshine
2016-05-22 10:43 ` [PATCH v2 5/5] worktree: add "unlock" command Nguyễn Thái Ngọc Duy
2016-05-23 4:39 ` Eric Sunshine
2016-05-23 4:51 ` [PATCH v2 0/5] worktree lock/unlock Eric Sunshine
2016-05-23 9:23 ` Duy Nguyen
2016-05-30 10:49 ` [PATCH v3 0/6] " Nguyễn Thái Ngọc Duy
2016-05-30 10:49 ` [PATCH v3 1/6] worktree.c: add find_worktree() Nguyễn Thái Ngọc Duy
2016-05-30 10:49 ` [PATCH v3 2/6] worktree.c: find_worktree() learns to identify worktrees by basename Nguyễn Thái Ngọc Duy
2016-05-31 17:51 ` Junio C Hamano
2016-06-01 13:22 ` Duy Nguyen
2016-06-01 18:44 ` Junio C Hamano
2016-06-02 9:40 ` Duy Nguyen
2016-06-02 16:49 ` Junio C Hamano
2016-06-03 11:11 ` Duy Nguyen
2016-06-03 15:30 ` Junio C Hamano
2016-06-05 7:15 ` Johannes Schindelin
2016-05-30 10:49 ` [PATCH v3 3/6] worktree.c: add is_main_worktree() Nguyễn Thái Ngọc Duy
2016-05-31 17:52 ` Junio C Hamano
2016-05-30 10:49 ` [PATCH v3 4/6] worktree.c: retrieve lock status (and optionally reason) in get_worktrees() Nguyễn Thái Ngọc Duy
2016-05-31 17:55 ` Junio C Hamano
2016-06-01 13:02 ` Duy Nguyen
2016-06-01 15:23 ` Junio C Hamano
2016-05-30 10:49 ` [PATCH v3 5/6] worktree: add "lock" command Nguyễn Thái Ngọc Duy
2016-05-31 18:10 ` Junio C Hamano
2016-05-31 18:28 ` Junio C Hamano
2016-05-30 10:49 ` Nguyễn Thái Ngọc Duy [this message]
2016-05-31 18:12 ` [PATCH v3 6/6] worktree: add "unlock" command Junio C Hamano
2016-06-01 13:10 ` Duy Nguyen
2016-05-31 18:31 ` Junio C Hamano
2016-05-31 18:35 ` Junio C Hamano
2016-06-03 12:19 ` [PATCH v4 0/6] worktree lock/unlock Nguyễn Thái Ngọc Duy
2016-06-03 12:19 ` [PATCH v4 1/6] worktree.c: add find_worktree() Nguyễn Thái Ngọc Duy
2016-06-03 15:00 ` Ramsay Jones
2016-06-13 12:22 ` Duy Nguyen
2016-06-03 12:19 ` [PATCH v4 2/6] worktree.c: add is_main_worktree() Nguyễn Thái Ngọc Duy
2016-06-03 12:19 ` [PATCH v4 3/6] worktree.c: add is_worktree_locked() Nguyễn Thái Ngọc Duy
2016-06-03 12:19 ` [PATCH v4 4/6] worktree: add "lock" command Nguyễn Thái Ngọc Duy
2016-06-03 12:19 ` [PATCH v4 5/6] worktree: add "unlock" command Nguyễn Thái Ngọc Duy
2016-06-03 12:19 ` [PATCH v4 6/6] worktree.c: find_worktree() search by path suffix Nguyễn Thái Ngọc Duy
2016-06-04 5:14 ` [PATCH v4 0/6] worktree lock/unlock Junio C Hamano
2016-06-13 12:18 ` [PATCH v5 " Nguyễn Thái Ngọc Duy
2016-06-13 12:18 ` [PATCH v5 1/6] worktree.c: add find_worktree() Nguyễn Thái Ngọc Duy
2016-06-13 12:18 ` [PATCH v5 2/6] worktree.c: add is_main_worktree() Nguyễn Thái Ngọc Duy
2016-06-13 12:18 ` [PATCH v5 3/6] worktree.c: add is_worktree_locked() Nguyễn Thái Ngọc Duy
2016-06-13 12:18 ` [PATCH v5 4/6] worktree: add "lock" command Nguyễn Thái Ngọc Duy
2016-06-13 12:18 ` [PATCH v5 5/6] worktree: add "unlock" command Nguyễn Thái Ngọc Duy
2016-06-13 12:18 ` [PATCH v5 6/6] worktree.c: find_worktree() search by path suffix Nguyễn Thái Ngọc Duy
2016-06-27 9:57 ` [PATCH v4 0/6] worktree lock/unlock Torsten Bögershausen
2016-06-30 16:01 ` [PATCH] fixup! worktree: add "lock" command Nguyễn Thái Ngọc Duy
2016-04-22 13:01 ` [PATCH v3 06/13] path.c: refactor and add worktree_git_path() Nguyễn Thái Ngọc Duy
2016-04-22 13:01 ` [PATCH v3 07/13] wt-status.c: split rebase detection out of wt_status_get_state() Nguyễn Thái Ngọc Duy
2016-04-22 13:01 ` [PATCH v3 08/13] wt-status.c: make wt_status_check_rebase() work on any worktree Nguyễn Thái Ngọc Duy
2016-04-22 13:01 ` [PATCH v3 09/13] worktree.c: avoid referencing to worktrees[i] multiple times Nguyễn Thái Ngọc Duy
2016-04-22 13:01 ` [PATCH v3 10/13] worktree.c: check whether branch is rebased in another worktree Nguyễn Thái Ngọc Duy
2016-04-22 13:01 ` [PATCH v3 11/13] wt-status.c: split bisect detection out of wt_status_get_state() Nguyễn Thái Ngọc Duy
2016-04-22 13:01 ` [PATCH v3 12/13] worktree.c: check whether branch is bisected in another worktree Nguyễn Thái Ngọc Duy
2016-05-11 5:45 ` Eric Sunshine
2016-04-22 13:01 ` [PATCH v3 13/13] branch: do not rename a branch under bisect or rebase Nguyễn Thái Ngọc Duy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160530104939.28407-7-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=rappazzo@gmail.com \
--cc=rethab.ch@gmail.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).