Re: [PATCH v2 19/19] pull: remove redirection to git-pull.sh

From: Stefan Beller <sbeller@google.com>
Date: Jun 3, 2015, 17:49 UTC
Message-ID: <CAGZ79kaR_MFgbo6F9=1s9h5OtXSDu6526iKT_hVcUCq9vpf8-A@mail.gmail.com>
In-Reply-To: <1433314143-4478-20-git-send-email-pyokagan@gmail.com>

On Tue, Jun 2, 2015 at 11:49 PM, Paul Tan <pyokagan@gmail.com> wrote:

Show 10 quoted lines

> 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>

The whole series was a pleasant read.

Thanks, Stefan

Show 44 quoted lines

> ---
>  Makefile                                    | 1 -
>  builtin/pull.c                              | 7 -------
>  git-pull.sh => contrib/examples/git-pull.sh | 0
>  3 files changed, 8 deletions(-)
>  rename git-pull.sh => contrib/examples/git-pull.sh (100%)
>
> diff --git a/Makefile b/Makefile
> index 2057a9d..67cef1c 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
> diff --git a/builtin/pull.c b/builtin/pull.c
> index 4e1ab5b..dad49cf 100644
> --- a/builtin/pull.c
> +++ b/builtin/pull.c
> @@ -805,13 +805,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
> similarity index 100%
> rename from git-pull.sh
> rename to contrib/examples/git-pull.sh
> --
> 2.1.4
>