Skip to content

Commit b145660

Browse files
pyokagangitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent b7b3147 commit b145660

File tree

3 files changed

+0
-8
lines changed

3 files changed

+0
-8
lines changed

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,6 @@ SCRIPT_SH += git-merge-octopus.sh
474474
SCRIPT_SH += git-merge-one-file.sh
475475
SCRIPT_SH += git-merge-resolve.sh
476476
SCRIPT_SH += git-mergetool.sh
477-
SCRIPT_SH += git-pull.sh
478477
SCRIPT_SH += git-quiltimport.sh
479478
SCRIPT_SH += git-rebase.sh
480479
SCRIPT_SH += git-remote-testgit.sh

builtin/pull.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -798,13 +798,6 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
798798
unsigned char orig_head[GIT_SHA1_RAWSZ], curr_head[GIT_SHA1_RAWSZ];
799799
unsigned char rebase_fork_point[GIT_SHA1_RAWSZ];
800800

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-
808801
if (!getenv("GIT_REFLOG_ACTION"))
809802
set_reflog_message(argc, argv);
810803

File renamed without changes.

0 commit comments

Comments
 (0)