Merge pull request #5342 from reynir/revision-full-hash

git, hg: Use full revision
ocaml · Jan 4, 2023 · 601e244 · 601e244
2 parents 56a3a15 + 0d94c43
commit 601e244
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/master_changes.md b/master_changes.md
@@ -203,6 +203,7 @@ users)
   * Use 4.08's unnamed functor arguments to silence warning 67 [#4775 @dra27]
   * git: disable colored output [#4884 @rjbou]
   * Check if a source is up to date with subpath [#4876 @rjbou]
+  * git, hg: Use the full SHA1 revision instead of just the 8 first characters [#5342 @reynir]
 
 ## Build
   * Bump src_exts and fix build compat with Dune 2.9.0 [#4752 @dra27]

diff --git a/src/repository/opamGit.ml b/src/repository/opamGit.ml
@@ -159,10 +159,7 @@ module VCS : OpamVCS.VCS = struct
        match r.OpamProcess.r_stdout with
        | []      -> Done None
        | full::_ ->
-         if String.length full > 8 then
-           Done (Some (String.sub full 0 8))
-         else
-           Done (Some full))
+         Done (Some full))
 
   let clean repo_root =
     git repo_root [ "clean"; "-fdx" ]

diff --git a/src/repository/opamHg.ml b/src/repository/opamHg.ml
@@ -53,8 +53,7 @@ module VCS = struct
     match r.OpamProcess.r_stdout with
     | [] -> Done None
     | full::_ ->
-      if String.length full > 8 then Done (Some (String.sub full 0 8))
-      else Done (Some full)
+      Done (Some full)
 
   let clean repo_root =
     hg repo_root ["revert"; "--all"; "--no-backup"]