From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 3 Jul 2024 20:18:07 +0000 (+0200)
Subject: mkosi: Fix sync script git command
X-Git-Tag: v257-rc1~976
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d1bbeeea4cd9317ad5915c99641aa9d82c4bc37d;p=thirdparty%2Fsystemd.git

mkosi: Fix sync script git command

Let's make sure we actually operate on the packaging git repo.
---

diff --git a/mkosi.images/system/mkosi.sync b/mkosi.images/system/mkosi.sync
index 517b7c93467..d56ddf57906 100755
--- a/mkosi.images/system/mkosi.sync
+++ b/mkosi.images/system/mkosi.sync
@@ -15,7 +15,7 @@ if [[ -d "$PKG_SUBDIR/.git" ]]; then
     fi
 
     # If work is being done on the packaging rules in a separate branch, don't touch the checkout.
-    if ! git merge-base --is-ancestor HEAD "origin/$GIT_BRANCH"; then
+    if ! git -C "$PKG_SUBDIR" merge-base --is-ancestor HEAD "origin/$GIT_BRANCH"; then
         EXIT_STATUS=$?
         if [[ $EXIT_STATUS -eq 1 ]]; then
             exit 0