Skip to content

Commit

Permalink
installer: special-case .vfs. versions
Browse files Browse the repository at this point in the history
Installing v2.46.0.vfs.0.0 while the official Git for Windows
v2.46.0 is installed constitutes neither an upgrade nor a downgrade. So
let's not complain that it is!

Signed-off-by: Johannes Schindelin <[email protected]>
  • Loading branch information
dscho committed Aug 23, 2024
1 parent 6973873 commit 9573084
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion installer/install.iss
Original file line number Diff line number Diff line change
Expand Up @@ -959,6 +959,9 @@ begin
j:=j+1;
Continue;
end;
// special-case `.vfs.` versions; They are neither downgrades nor upgrades.
if (Copy(CurrentVersion,i,4)='vfs.') or (Copy(PreviousVersion,i,4)='vfs.') then
Result:=0;
Exit;
end;
if Current<0 then begin
Expand Down Expand Up @@ -1153,7 +1156,8 @@ begin
not SelfCheckVersionCompare('2.32.0-rc2','2.32.0',-1) or
not SelfCheckVersionCompare('2.32.0-rc2','2.32.0.0',-1) or
not SelfCheckVersionCompare('2.34.0.rc1','2.33.1',1) or
not SelfCheckVersionCompare('2.34.0.rc2','2.34.0',-1) then
not SelfCheckVersionCompare('2.34.0.rc2','2.34.0',-1) or
not SelfCheckVersionCompare('git version 2.46.0.vfs.0.0','git version 2.46.0.windows.1',0) then
Failed:=True;
if Failed then
Expand Down

0 comments on commit 9573084

Please sign in to comment.