From c84bda6b5277ef1429f85e10af12d287fad82db0 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@robmensching.com>
Date: Sat, 22 Dec 2018 06:21:13 -0800
Subject: [PATCH] Update to Git v2.20.1.1 and posh-git v1.0.0-beta2

---
 lib/posh-git                  | 2 +-
 src/Package/GitComponents.wxs | 6 +++---
 src/Package/GitProduct.wxs    | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/posh-git b/lib/posh-git
index 9b6ee1c..4ef2d5e 160000
--- a/lib/posh-git
+++ b/lib/posh-git
@@ -1 +1 @@
-Subproject commit 9b6ee1cb5f178e80b9b0aa69ca85196e0f487c5c
+Subproject commit 4ef2d5efbceb5a8ef7423078f017db512631df88
diff --git a/src/Package/GitComponents.wxs b/src/Package/GitComponents.wxs
index 57f7e42..4410e54 100644
--- a/src/Package/GitComponents.wxs
+++ b/src/Package/GitComponents.wxs
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:fg="http://www.firegiant.com/schemas/v3/wxs/fgwep.xsd">
   <Fragment>
-    <ComponentGroup Id='GitComponents' Directory='INSTALLFOLDER'>
-      <Component>
+    <ComponentGroup Id='GitComponents'>
+      <Component Directory='BinFolder'>
         <fg:HarvestFile Source='..\..\files\bin\git.exe' KeyIdentifier='git.exe' />
       </Component>
-      <Component>
+      <Component Directory='INSTALLFOLDER'>
         <fg:HarvestFolder Source='..\..\files\' Strategy='contentFileComponentsWithGeneratedKeyPath' />
       </Component>
     </ComponentGroup>
diff --git a/src/Package/GitProduct.wxs b/src/Package/GitProduct.wxs
index ea68a0c..9146a44 100644
--- a/src/Package/GitProduct.wxs
+++ b/src/Package/GitProduct.wxs
@@ -12,7 +12,7 @@
     <Feature Id='Git'>
       <Component Directory='INSTALLFOLDER'>
         <RegistryValue Root='HKLM' Key='Software\Git' Name='InstallFolder' Value='[INSTALLFOLDER]' Type='string' />
-        <Environment Id='UpdatePath' Name='PATH' Value='[dir6224ijVLx94XYG2KL6z4YR8qrrs]' Action='set' Part='last' System='yes' />
+        <Environment Id='UpdatePath' Name='PATH' Value='[BinFolder]' Action='set' Part='last' System='yes' />
       </Component>
 
       <Component Directory='INSTALLFOLDER'>
@@ -30,6 +30,7 @@
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' Name='PFiles'>
         <Directory Id='INSTALLFOLDER' Name='Git'>
+          <Directory Id='BinFolder' Name='bin' />
           <Directory Id='Mingw32Folder' Name='mingw32'>
             <Directory Id='LibexecFolder' Name='libexec'>
               <Directory Id='GitCoreFolder' Name='git-core' />