aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPaul Tan <pyokagan@gmail.com>2015-06-18 18:54:12 +0800
committerJunio C Hamano <gitster@pobox.com>2015-06-18 13:18:59 -0700
commitb1456605c26eb6bd991b70b0ca0a3ce0f02473e9 (patch)
treea49606d83cf9e27f17c203ae9bd70651304d5141 /Makefile
parentb7b314711ad28b129e6c5916eee1f2036ffa94df (diff)
downloadgit-b1456605c26eb6bd991b70b0ca0a3ce0f02473e9.tar.gz
git-b1456605c26eb6bd991b70b0ca0a3ce0f02473e9.tar.xz
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 'Makefile')
-rw-r--r--Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 2057a9d46..67cef1cd2 100644
--- a/Makefile
+++ b/Makefile
@@ -474,7 +474,6 @@ SCRIPT_SH += git-merge-octopus.sh
SCRIPT_SH += git-merge-one-file.sh
SCRIPT_SH += git-merge-resolve.sh
SCRIPT_SH += git-mergetool.sh
-SCRIPT_SH += git-pull.sh
SCRIPT_SH += git-quiltimport.sh
SCRIPT_SH += git-rebase.sh
SCRIPT_SH += git-remote-testgit.sh