pull: remove redirection to git-pull.sh
At the beginning of the rewrite of git-pull.sh to C, we introduced a redirection to git-pull.sh if the environment variable _GIT_USE_BUILTIN_PULL was not defined in order to not break test scripts that relied on a functional git-pull. Now that all of git-pull's functionality has been re-implemented in builtin/pull.c, remove this redirection, and retire the old git-pull.sh into contrib/examples/. Signed-off-by: Paul Tan <pyokagan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Paul Tan committed
Jun 18, 2015 at 18:54 UTC
b1456605c26eb6bd991b70b0ca0a3ce0f02473e9
3 files changed
-8
Makefile
-1
@@ -474,7 +474,6 @@ SCRIPT_SH += git-merge-octopus.sh
474
SCRIPT_SH += git-merge-one-file.sh
475
SCRIPT_SH += git-merge-resolve.sh
476
SCRIPT_SH += git-mergetool.sh
477
-SCRIPT_SH += git-pull.sh
477
SCRIPT_SH += git-quiltimport.sh
478
SCRIPT_SH += git-rebase.sh
479
SCRIPT_SH += git-remote-testgit.sh
builtin/pull.c
-7
@@ -798,13 +798,6 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
798
unsigned char orig_head[GIT_SHA1_RAWSZ], curr_head[GIT_SHA1_RAWSZ];
799
unsigned char rebase_fork_point[GIT_SHA1_RAWSZ];
800
801
- if (!getenv("_GIT_USE_BUILTIN_PULL")) {
802
- const char *path = mkpath("%s/git-pull", git_exec_path());
803
-
804
- if (sane_execvp(path, (char **)argv) < 0)
805
- die_errno("could not exec %s", path);
806
- }
807
-
801
if (!getenv("GIT_REFLOG_ACTION"))
802
set_reflog_message(argc, argv);
803