From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 28 May 2025 11:27:10 +0000 (+0200)
Subject: Check that commit exists in config_parse_minimum_version()
X-Git-Tag: v26~210
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a12fb1befc46c5346ed023758ae66bcb01a8cdf;p=thirdparty%2Fmkosi.git

Check that commit exists in config_parse_minimum_version()

merge-base will blow up when given a commit that does not exist in
the checked out repository, so let's check that first before checking
whether the currently checked out commit has the minimum version one as
its ancestor.
---

diff --git a/mkosi/config.py b/mkosi/config.py
index 7f25484f1..7a479db2b 100644
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -1490,7 +1490,14 @@ def config_parse_minimum_version(value: Optional[str], old: Optional[str]) -> Op
 
             current = run([*git, "rev-parse", "HEAD"], stdout=subprocess.PIPE).stdout.strip()
 
-            result = run([*git, "merge-base", "--is-ancestor", hash, current], check=False)
+            result = run(
+                [*git, "rev-parse", "--quiet", "--verify", f"{hash}^{{commit}}"],
+                # git rev-parse seems to produce output even with --quiet added to the options.
+                stdout=subprocess.DEVNULL,
+                check=False,
+            )
+            if result.returncode == 0:
+                result = run([*git, "merge-base", "--is-ancestor", hash, current], check=False)
             if result.returncode == 1:
                 die(
                     f"mkosi commit {hash} or newer is required by this configuration",