diff options
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | builtin/pull.c | 7 | ||||
| -rwxr-xr-x | contrib/examples/git-pull.sh (renamed from git-pull.sh) | 0 |
3 files changed, 0 insertions, 8 deletions
@@ -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 diff --git a/builtin/pull.c b/builtin/pull.c index 421a34de4..722a83c51 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); diff --git a/git-pull.sh b/contrib/examples/git-pull.sh index 0917d0d05..0917d0d05 100755 --- a/git-pull.sh +++ b/contrib/examples/git-pull.sh |