summaryrefslogtreecommitdiff
path: root/git-submodule.sh
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2013-10-28 21:19:59 -0400
committerJunio C Hamano <gitster@pobox.com>2013-10-29 12:41:17 -0700
commitfcb06a8d54e29d12bb8160b978ce78331c95a1bf (patch)
treee82b2c9d67500d7b9cd3936a4b4731cfbdfe6c27 /git-submodule.sh
parente45bda876ae2e39ac1e11ba1609f2c363ad4959a (diff)
downloadgit-fcb06a8d54e29d12bb8160b978ce78331c95a1bf.tar.gz
use @@PERL@@ in built scriptsjk/replace-perl-in-built-scripts
Several of the built shell commands invoke a bare "perl" to perform some one-liners. This will use the first perl in the PATH rather than the one specified by the user's SHELL_PATH. We are not asking these perl invocations to do anything exotic, so typically any old system perl will do; however, in some cases the system perl may have unexpected behavior (e.g., by handling line endings differently). We should err on the side of using the perl the user pointed us to. The downside of this is that on systems with a sane perl setup, we no longer find the perl at runtime, but instead point to a static perl (like /usr/bin/perl). That means we will not handle somebody moving perl without rebuilding git, whereas before we tracked it just fine. This is probably not a big deal, though, as the built perl scripts already suffered from this. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-submodule.sh')
-rwxr-xr-xgit-submodule.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-submodule.sh b/git-submodule.sh
index b3108b8ea9..4cf94d1056 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -115,7 +115,7 @@ module_list()
git ls-files --error-unmatch --stage -- "$@" ||
echo "unmatched pathspec exists"
) |
- perl -e '
+ @@PERL@@ -e '
my %unmerged = ();
my ($null_sha1) = ("0" x 40);
my @out = ();