installer: infer defaults also from ProgramData

We write some settings to C:\ProgramData\Git\config: those that are deemed not special to Git for Windows, but of use to any Git implementation. Example: core.autocrlf. So let's look at ProgramData first to figure out whether there were any second thoughts about previous install options, after the fact. Because we can. Signed-off-by: Johannes Schindelin <[email protected]>
git-for-windows · Feb 20, 2019 · e1e83d7 · e1e83d7
1 parent dfb308c
commit e1e83d7
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/installer/install.iss b/installer/install.iss
@@ -669,15 +669,26 @@ begin
     end;
 end;
 
-function GetDefaultsFromGitSystemConfig():Boolean;
+function GetDefaultsFromGitConfig(WhichOne:String):Boolean;
 var
-    TmpFile,Key,Value:String;
+    ExtraOptions,TmpFile,Key,Value:String;
     FileContents:AnsiString;
     Values:TArrayOfString;
     c,i,j,k:Integer;
 begin
+    case WhichOne of
+    'ProgramData': ExtraOptions:='-f "'+ExpandConstant('{commonappdata}\Git\config')+'"';
+    'system': ExtraOptions:='--system';
+    else
+        begin
+            LogError('Invalid config type: '+WhichOne);
+            Result:=False;
+            Exit
+        end
+    end;
+
     TmpFile:=ExpandConstant('{tmp}\git-config-get.txt');
-    if not Exec(ExpandConstant('{cmd}'),'/C .\{#MINGW_BITNESS}\bin\git.exe config -l -z --system >'+#34+TmpFile+#34,
+    if not Exec(ExpandConstant('{cmd}'),'/C .\{#MINGW_BITNESS}\bin\git.exe config -l -z '+ExtraOptions+' >'+#34+TmpFile+#34,
                 AppDir,SW_HIDE,ewWaitUntilTerminated,i) then
         LogError('Unable to get system config');
 
@@ -1455,7 +1466,8 @@ begin
     InferredDefaultValues:=TStringList.Create;
     QueryUninstallValues();
     AppDir:=UninstallAppPath;
-    GetDefaultsFromGitSystemConfig();
+    GetDefaultsFromGitConfig('ProgramData');
+    GetDefaultsFromGitConfig('system');
 
     ChosenOptions:='';