From 6e2801b50aebfdf6a7e40932e450cc2ed84e50ba Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 20 Apr 2009 17:59:03 +0200 Subject: [PATCH] Portable Git: include builtins as-are We do not want to rely on an installation procedure which would hardlink git.exe to the builtins, so we need to include them as they are. Noticed by Magnus Carlsson, analyzed by Clifford Caoile. Signed-off-by: Johannes Schindelin --- share/WinGit/copy-files.sh | 8 ++++++-- share/WinGit/portable-release.sh | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/share/WinGit/copy-files.sh b/share/WinGit/copy-files.sh index c32899cd..afdbbe7f 100644 --- a/share/WinGit/copy-files.sh +++ b/share/WinGit/copy-files.sh @@ -55,8 +55,12 @@ rm -rf bin/cvs.exe && test -f lib/perl5/site_perl/Git.pm && gitmd5=$(md5sum bin/git.exe | cut -c 1-32) && mkdir etc && -md5sum {bin,libexec/git-core}/git-*.exe | sed -n "s/^$gitmd5 \\*//p" > etc/fileList-builtins.txt && -rm $(cat etc/fileList-builtins.txt) && +if -z "$DONT_REMOVE_BUILTINS" +then + md5sum {bin,libexec/git-core}/git-*.exe | + sed -n "s/^$gitmd5 \\*//p" > etc/fileList-builtins.txt && + rm $(cat etc/fileList-builtins.txt) +fi && (cd /mingw && tar cf - bin/*{tcl,tk,wish,gpg,curl.exe,libcurl,libiconv}* \ lib/*{tcl,tk}* libexec/gnupg/) | tar xf - && diff --git a/share/WinGit/portable-release.sh b/share/WinGit/portable-release.sh index b4f459bd..087f98b2 100644 --- a/share/WinGit/portable-release.sh +++ b/share/WinGit/portable-release.sh @@ -10,7 +10,7 @@ OPTS7="-m0=lzma -mx=9 -md=64M" TARGET7=tmp.7z TMPDIR=/tmp/WinGit -"$(dirname $0)/copy-files.sh" $TMPDIR && +DONT_REMOVE_BUILTINS=1 "$(dirname $0)/copy-files.sh" $TMPDIR && cd "$TMPDIR" && cp /share/WinGit/README.portable ./ && cp /msys.bat ./git-bash.bat && -- 2.11.4.GIT