Às 20:30 de 01-06-2016, Junio C Hamano escreveu:
> Junio C Hamano <[email protected]> writes:
> Would it allow you to lose the $(git --exec-path) prefix in the new
> dot-source to have this patch before applying your patch?
>
> -- >8 --
> Subject: t2300: run git-sh-setup in an environment that better mimics the
> real life
>
> When we run scripted Porcelains, "git" potty has set up the $PATH by
> prepending $GIT_EXEC_PATH, the path given by "git --exec-path=$there
> $cmd", etc. already. Because of this, scripted Porcelains can
> dot-source shell script library like git-sh-setup with simple dot
> without specifying any path.
>
> t2300 however dot-sources git-sh-setup without adjusting $PATH like
> the real "git" potty does. This has not been a problem so far, but
> once git-sh-setup wants to rely on the $PATH adjustment, just like
> any scripted Porcelains already do, it would become one. It cannot
> for example dot-source another shell library without specifying the
> full path to it by prefixing $(git --exec-path).
>
> Signed-off-by: Junio C Hamano <[email protected]>
> ---
> t/t2300-cd-to-toplevel.sh | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/t/t2300-cd-to-toplevel.sh b/t/t2300-cd-to-toplevel.sh
> index 9965bc5..cccd7d9 100755
> --- a/t/t2300-cd-to-toplevel.sh
> +++ b/t/t2300-cd-to-toplevel.sh
> @@ -8,7 +8,8 @@ test_cd_to_toplevel () {
> test_expect_success $3 "$2" '
> (
> cd '"'$1'"' &&
> - . "$(git --exec-path)"/git-sh-setup &&
> + PATH="$(git --exec-path):$PATH" &&
> + . git-sh-setup &&
> cd_to_toplevel &&
> [ "$(pwd -P)" = "$TOPLEVEL" ]
> )
>
Yes, this patch allows to have . git-sh-i18n instead of
. "$(git --exec-path)"/git-sh-i18n in git-sh-setup.sh file.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
