Merge pull request #229540 from ShamrockLee/git-fix-ls
Revert #224474, git completion command patching
This commit is contained in:
commit
cc8e3e9c1f
|
@ -186,14 +186,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
|
|
||||||
# Fix references to the perl, sed, awk and various coreutil binaries used by
|
# Fix references to the perl, sed, awk and various coreutil binaries used by
|
||||||
# shell scripts that git calls (e.g. filter-branch)
|
# shell scripts that git calls (e.g. filter-branch)
|
||||||
# and completion scripts
|
|
||||||
SCRIPT="$(cat <<'EOS'
|
SCRIPT="$(cat <<'EOS'
|
||||||
BEGIN{
|
BEGIN{
|
||||||
@a=(
|
@a=(
|
||||||
'${gnugrep}/bin/grep', '${gnused}/bin/sed', '${gawk}/bin/awk',
|
'${gnugrep}/bin/grep', '${gnused}/bin/sed', '${gawk}/bin/awk',
|
||||||
'${coreutils}/bin/cut', '${coreutils}/bin/basename', '${coreutils}/bin/dirname',
|
'${coreutils}/bin/cut', '${coreutils}/bin/basename', '${coreutils}/bin/dirname',
|
||||||
'${coreutils}/bin/wc', '${coreutils}/bin/tr',
|
'${coreutils}/bin/wc', '${coreutils}/bin/tr'
|
||||||
'${coreutils}/bin/ls'
|
|
||||||
${lib.optionalString perlSupport ", '${perlPackages.perl}/bin/perl'"}
|
${lib.optionalString perlSupport ", '${perlPackages.perl}/bin/perl'"}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -204,8 +202,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
EOS
|
EOS
|
||||||
)"
|
)"
|
||||||
perl -0777 -i -pe "$SCRIPT" \
|
perl -0777 -i -pe "$SCRIPT" \
|
||||||
$out/libexec/git-core/git-{sh-setup,filter-branch,merge-octopus,mergetool,quiltimport,request-pull,submodule,subtree,web--browse} \
|
$out/libexec/git-core/git-{sh-setup,filter-branch,merge-octopus,mergetool,quiltimport,request-pull,submodule,subtree,web--browse}
|
||||||
$out/share/bash-completion/completions/{git,gitk}
|
|
||||||
|
|
||||||
|
|
||||||
# Also put git-http-backend into $PATH, so that we can use smart
|
# Also put git-http-backend into $PATH, so that we can use smart
|
||||||
|
|
Loading…
Reference in a new issue