Update to git v2.39.1 and Posh-Git v1.1.0

robmen · Feb 14, 2023 · e0449a6 · e0449a6
1 parent 18d9049
commit e0449a6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/lib/posh-git b/lib/posh-git
diff --git a/src/Package/GitComponents.wxs b/src/Package/GitComponents.wxs
@@ -12,9 +12,9 @@
   </Fragment>
 
   <Fragment>
-    <ComponentGroup Id='GitCredentialManager' Directory='GitCoreFolder'>
+    <ComponentGroup Id='GitCredentialManager' Directory='Mingw32BinFolder'>
       <Component>
-        <fg:HarvestFile Id='CredManagerFile' Source='..\..\files\mingw32\libexec\git-core\git-credential-manager-core.exe' />
+        <fg:HarvestFile Id='CredManagerFile' Source='..\..\files\mingw32\bin\git-credential-manager-core.exe' />
       </Component>
     </ComponentGroup>
 

diff --git a/src/Package/GitProduct.wxs b/src/Package/GitProduct.wxs
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'
      xmlns:dep='http://schemas.microsoft.com/wix/DependencyExtension'>
-  <Product Id='*' Name='Git on Windows' Language='1033' Manufacturer='RobMensching.com LLC'
+  <Product Id='*' Name='Git on Windows' Language='1033' Manufacturer='Rob Mensching'
                   Version='!(bind.fileVersion.git.exe)'
                   UpgradeCode='abbb3e1d-fea0-4b84-9585-b4dc13cbc1b4'>
     <Package InstallScope='perMachine' Compressed='yes' />
@@ -32,6 +32,7 @@
         <Directory Id='INSTALLFOLDER' Name='Git'>
           <Directory Id='BinFolder' Name='bin' />
           <Directory Id='Mingw32Folder' Name='mingw32'>
+            <Directory Id='Mingw32BinFolder' Name='bin' />
             <Directory Id='LibexecFolder' Name='libexec'>
               <Directory Id='GitCoreFolder' Name='git-core' />
             </Directory>
+2 −0		.git-blame-ignore-revs
+41 −0		.github/workflows/powershell.yml
+41 −0		.github/workflows/pwsh.yml
+0 −37		.travis.yml
+49 −0		CHANGELOG.md
+10 −8		README.md
+0 −64		appveyor.yml
+2 −2		chocolatey/poshgit.nuspec
+11 −3		src/CheckRequirements.ps1
+16 −3		src/GitTabExpansion.ps1
+83 −67		src/GitUtils.ps1
+115 −0		src/Utils.ps1
+5 −0		src/WindowTitle.ps1
+4 −3		src/posh-git.psd1
+2 −1		src/posh-git.psm1
+45 −0		test/CheckRequirements.Tests.ps1
+16 −19		test/DefaultPrompt.Tests.ps1
+4 −2		test/Get-GitBranch.Tests.ps1
+151 −0		test/Get-GitStatus.Tests.ps1
+64 −64		test/GitProxyFunctionExpansion.Tests.ps1
+8 −9		test/Shared.ps1
+60 −22		test/TabExpansion.Tests.ps1
+36 −2		test/Utils.Tests.ps1