summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorPaul Tan <pyokagan@gmail.com>2015-06-14 16:41:51 +0800
committerJunio C Hamano <gitster@pobox.com>2015-06-15 12:40:50 -0700
commit1e1ea69fa4e5fb20baefe9e5422527e971d56a86 (patch)
tree747254bde5fa4f5b1fc09cbf2a0672f61b87db8a /git.c
parent85b343245b495a47f937007e1c0650f2070b9b4f (diff)
downloadgit-1e1ea69fa4e5fb20baefe9e5422527e971d56a86.tar.gz
pull: implement skeletal builtin pull
For the purpose of rewriting git-pull.sh into a C builtin, implement a skeletal builtin/pull.c that redirects to $GIT_EXEC_PATH/git-pull.sh if the environment variable _GIT_USE_BUILTIN_PULL is not defined. This allows us to fall back on the functional git-pull.sh when running the test suite for tests that depend on a working git-pull implementation. This redirection should be removed when all the features of git-pull.sh have been re-implemented in builtin/pull.c. Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Paul Tan <pyokagan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git.c')
-rw-r--r--git.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/git.c b/git.c
index 44374b1d9b..e7a77136d6 100644
--- a/git.c
+++ b/git.c
@@ -445,6 +445,7 @@ static struct cmd_struct commands[] = {
{ "pickaxe", cmd_blame, RUN_SETUP },
{ "prune", cmd_prune, RUN_SETUP },
{ "prune-packed", cmd_prune_packed, RUN_SETUP },
+ { "pull", cmd_pull, RUN_SETUP | NEED_WORK_TREE },
{ "push", cmd_push, RUN_SETUP },
{ "read-tree", cmd_read_tree, RUN_SETUP },
{ "receive-pack", cmd_receive_pack },