summaryrefslogtreecommitdiff
path: root/builtin/pull.c
diff options
context:
space:
mode:
authorPaul Tan <pyokagan@gmail.com>2015-06-18 10:54:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-06-18 20:18:59 (GMT)
commitb1456605c26eb6bd991b70b0ca0a3ce0f02473e9 (patch)
treea49606d83cf9e27f17c203ae9bd70651304d5141 /builtin/pull.c
parentb7b314711ad28b129e6c5916eee1f2036ffa94df (diff)
downloadgit-b1456605c26eb6bd991b70b0ca0a3ce0f02473e9.zip
git-b1456605c26eb6bd991b70b0ca0a3ce0f02473e9.tar.gz
git-b1456605c26eb6bd991b70b0ca0a3ce0f02473e9.tar.bz2
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>
Diffstat (limited to 'builtin/pull.c')
-rw-r--r--builtin/pull.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/builtin/pull.c b/builtin/pull.c
index 421a34d..722a83c 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -798,13 +798,6 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
unsigned char orig_head[GIT_SHA1_RAWSZ], curr_head[GIT_SHA1_RAWSZ];
unsigned char rebase_fork_point[GIT_SHA1_RAWSZ];
- if (!getenv("_GIT_USE_BUILTIN_PULL")) {
- const char *path = mkpath("%s/git-pull", git_exec_path());
-
- if (sane_execvp(path, (char **)argv) < 0)
- die_errno("could not exec %s", path);
- }
-
if (!getenv("GIT_REFLOG_ACTION"))
set_reflog_message(argc, argv);