]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
mkosi: Log in mkosi.sync when we don't check out commit
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Fri, 21 Mar 2025 13:30:34 +0000 (14:30 +0100)
committerLuca Boccassi <luca.boccassi@gmail.com>
Tue, 8 Apr 2025 19:52:11 +0000 (20:52 +0100)
(cherry picked from commit 3ffcbb6b9a0f13325b4f73233a6d9b28ad240310)
(cherry picked from commit 8cd8ac8d92e1628b66b48135a603aae70e2170b1)

mkosi.images/build/mkosi.sync

index eeaa73e98f0d301f68d1c450b40816c14d2dab2c..200695155b00b1342b616329544c40545e143a2c 100755 (executable)
@@ -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