Merge pull request #5842 from rjbou/git-win-fix

arg: fix loading git location from config file at init
ocaml · Feb 16, 2024 · 1507b23 · 1507b23
2 parents 938e091 + c8d437f
commit 1507b23
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/master_changes.md b/master_changes.md
@@ -103,6 +103,7 @@ users)
 
 ## Internal: Windows
   * Ensure that the system critical error dialog is disabled when opam starts [#5828 @dra27]
+  * Fix loading git location at init [#5843 @rjbou]
 
 ## Test
 

diff --git a/src/client/opamArg.ml b/src/client/opamArg.ml
@@ -597,12 +597,12 @@ let apply_global_options cli o =
               { pelem = String cygcheck; _}::_  ->
               let cygbin = Filename.dirname cygcheck in
               OpamCoreConfig.update ~cygbin ()
-            | Some { pelem = String "git-location"; _},
-              { pelem = String git_location; _}::_  ->
-              OpamCoreConfig.update ~git_location ()
             | _, element::elements -> aux (Some element) elements
           in
           aux None elements
+        | { pelem = Variable ({ pelem = "git-location"; _},
+                              {pelem = String git_location; _}); _} ->
+          OpamCoreConfig.update ~git_location ()
         | _ -> ())
       opamfile.file_contents
   with