Skip to content

Commit 6b57f9f

Browse files
committed
installer: infer pull behaviour from config
Since Version 2.27.0 sometimes saved the wrong pull behaviour to /etc/install-options.txt, we can't quite trust the values in that file. The values in the system config file accurately represent the pull behaviour. Let's use those reliable records. Signed-off-by: Matthias Aßhauer <[email protected]>
1 parent bf312dc commit 6b57f9f

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

installer/install.iss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -803,6 +803,15 @@ begin
803803
'true': RecordInferredDefault('Enable Symlinks','Enabled');
804804
'false': RecordInferredDefault('Enable Symlinks','Disabled');
805805
end;
806+
'pull.ff':
807+
case Value of
808+
'only': RecordInferredDefault('Git Pull Behavior Option','FFOnly');
809+
end;
810+
'pull.rebase':
811+
case Value of
812+
'true': RecordInferredDefault('Git Pull Behavior Option','Rebase');
813+
'false': RecordInferredDefault('Git Pull Behavior Option','Merge');
814+
end;
806815
end;
807816
end;
808817
i:=j+1;

0 commit comments

Comments
 (0)