From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 21 Mar 2025 13:30:34 +0000 (+0100)
Subject: mkosi: Log in mkosi.sync when we don't check out commit
X-Git-Tag: v258-rc1~1024
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3ffcbb6b9a0f13325b4f73233a6d9b28ad240310;p=thirdparty%2Fsystemd.git

mkosi: Log in mkosi.sync when we don't check out commit
---

diff --git a/mkosi.images/build/mkosi.sync b/mkosi.images/build/mkosi.sync
index eeaa73e98f0..200695155b0 100755
--- a/mkosi.images/build/mkosi.sync
+++ b/mkosi.images/build/mkosi.sync
@@ -13,6 +13,7 @@ if [[ -d "pkg/$PKG_SUBDIR/.git" ]]; then
     fi
 
     if [[ -n "$(git -C "pkg/$PKG_SUBDIR" status --porcelain)" ]]; then
+        echo "pkg/$PKG_SUBDIR is dirty, not checking out commit $GIT_COMMIT" >&2
         exit 0
     fi
 
@@ -25,6 +26,7 @@ if [[ -d "pkg/$PKG_SUBDIR/.git" ]]; then
     if ! git -C "pkg/$PKG_SUBDIR" merge-base --is-ancestor HEAD "origin/$GIT_BRANCH"; then
         EXIT_STATUS=$?
         if [[ $EXIT_STATUS -eq 1 ]]; then
+            echo "Currently checked out pkg/$PKG_SUBDIR commit is not an ancestor of origin/$GIT_BRANCH, not checking out commit $GIT_COMMIT" >&2
             exit 0
         else
             exit $EXIT_STATUS