summaryrefslogtreecommitdiff
path: root/builtin/worktree.c
diff options
context:
space:
mode:
authorEric Sunshine <sunshine@sunshineco.com>2015-07-06 17:30:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-07-06 18:07:45 (GMT)
commitfc56361f58a20f1259e1ba2364424ec27825c37f (patch)
tree293d47e4d744f245ba7e656af919f5c4c7f0170a /builtin/worktree.c
parentbdf0f375b9cf1c272233583a03eddef1772da99e (diff)
downloadgit-fc56361f58a20f1259e1ba2364424ec27825c37f.zip
git-fc56361f58a20f1259e1ba2364424ec27825c37f.tar.gz
git-fc56361f58a20f1259e1ba2364424ec27825c37f.tar.bz2
worktree: introduce "add" command
The plan is to relocate "git checkout --to" functionality to "git worktree add". As a first step, introduce a bare-bones git-worktree "add" command along with documentation. At this stage, "git worktree add" merely invokes "git checkout --to" behind the scenes, but an upcoming patch will move the actual functionality (checkout.c:prepare_linked_checkout() and its helpers) to worktree.c. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/worktree.c')
-rw-r--r--builtin/worktree.c31
1 files changed, 31 insertions, 0 deletions
diff --git a/builtin/worktree.c b/builtin/worktree.c
index 2a729c6..e0749c0 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -2,8 +2,11 @@
#include "builtin.h"
#include "dir.h"
#include "parse-options.h"
+#include "argv-array.h"
+#include "run-command.h"
static const char * const worktree_usage[] = {
+ N_("git worktree add <path> <branch>"),
N_("git worktree prune [<options>]"),
NULL
};
@@ -119,6 +122,32 @@ static int prune(int ac, const char **av, const char *prefix)
return 0;
}
+static int add(int ac, const char **av, const char *prefix)
+{
+ struct child_process c;
+ const char *path, *branch;
+ struct argv_array cmd = ARGV_ARRAY_INIT;
+ struct option options[] = {
+ OPT_END()
+ };
+
+ ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
+ if (ac != 2)
+ usage_with_options(worktree_usage, options);
+
+ path = prefix ? prefix_filename(prefix, strlen(prefix), av[0]) : av[0];
+ branch = av[1];
+
+ argv_array_push(&cmd, "checkout");
+ argv_array_pushl(&cmd, "--to", path, NULL);
+ argv_array_push(&cmd, branch);
+
+ memset(&c, 0, sizeof(c));
+ c.git_cmd = 1;
+ c.argv = cmd.argv;
+ return run_command(&c);
+}
+
int cmd_worktree(int ac, const char **av, const char *prefix)
{
struct option options[] = {
@@ -127,6 +156,8 @@ int cmd_worktree(int ac, const char **av, const char *prefix)
if (ac < 2)
usage_with_options(worktree_usage, options);
+ if (!strcmp(av[1], "add"))
+ return add(ac - 1, av + 1, prefix);
if (!strcmp(av[1], "prune"))
return prune(ac - 1, av + 1, prefix);
usage_with_options(worktree_usage, options);