diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-07-03 22:18:07 +0200 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-07-03 22:40:31 +0200 |
| commit | d1bbeeea4cd9317ad5915c99641aa9d82c4bc37d (patch) | |
| tree | ffc41ed0a23eedec199c2e2e33056f731e51b85c /mkosi.images | |
| parent | README: add missing CONFIG_MEMCG kernel config option for oomd (diff) | |
| download | systemd-d1bbeeea4cd9317ad5915c99641aa9d82c4bc37d.tar.xz systemd-d1bbeeea4cd9317ad5915c99641aa9d82c4bc37d.zip | |
mkosi: Fix sync script git command
Let's make sure we actually operate on the packaging git repo.
Diffstat (limited to 'mkosi.images')
| -rwxr-xr-x | mkosi.images/system/mkosi.sync | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkosi.images/system/mkosi.sync b/mkosi.images/system/mkosi.sync index 517b7c9346..d56ddf5790 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 |