From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 5 Dec 2013 20:58:21 +0000 (-0800)
Subject: Merge branch 'jk/replace-perl-in-built-scripts'
X-Git-Tag: v1.9-rc0~99
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=219ea0e79d1e5cdb5f1133aff70fe4e5737dd59d;p=git

Merge branch 'jk/replace-perl-in-built-scripts'

* jk/replace-perl-in-built-scripts:
  use @@PERL@@ in built scripts
---

219ea0e79d1e5cdb5f1133aff70fe4e5737dd59d
diff --cc git-submodule.sh
index c878d9579d,4cf94d1056..ed02f03214
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@@ -151,12 -111,11 +151,12 @@@ relative_path (
  #
  module_list()
  {
 +	eval "set $(git rev-parse --sq --prefix "$wt_prefix" -- "$@")"
  	(
 -		git ls-files --error-unmatch --stage -- "$@" ||
 +		git ls-files -z --error-unmatch --stage -- "$@" ||
  		echo "unmatched pathspec exists"
  	) |
- 	perl -e '
+ 	@@PERL@@ -e '
  	my %unmerged = ();
  	my ($null_sha1) = ("0" x 40);
  	my @out = ();