From 12522aa7a2d41e8816ed6240546c9ca7788271e6 Mon Sep 17 00:00:00 2001
From: Adam Roben <adam@github.com>
Date: Mon, 30 Apr 2012 09:50:21 -0400
Subject: [PATCH] Make copy-files.sh fail if any copy step fails

Things used to work this way back before
baa94345e2a0c526cb32654d91724ca0275d3053, but a bad merge in that commit
caused this behavior to be lost.
---
 share/WinGit/copy-files.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/WinGit/copy-files.sh b/share/WinGit/copy-files.sh
index 2fb42494..b7413c71 100755
--- a/share/WinGit/copy-files.sh
+++ b/share/WinGit/copy-files.sh
@@ -97,6 +97,6 @@ cp $MSYSGITROOT/src/git-cheetah/explorer/git_shell_ext64.dll git-cheetah/ &&
 cp $MSYSGITROOT/share/WinGit/ReleaseNotes.rtf . &&
 sed 's/^\. .*\(git-completion.bash\)/. \/etc\/\1/' \
 	< $MSYSGITROOT/etc/profile > etc/profile &&
-cp $MSYSGITROOT/share/resources/git.ico etc/ ||
+cp $MSYSGITROOT/share/resources/git.ico etc/ &&
 find bin libexec -iname \*.exe -o -iname \*.dll | sort > etc/fileList-bindimage.txt ||
 exit 1
-- 
2.11.4.GIT