From c06364953b44b0abe00dc71978d74940e8e27f89 Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Sun, 14 Jul 2024 01:08:55 +0200
Subject: [PATCH] pkgs/clerie-update-nixfiles: Merge updates with Update Bot
 user

---
 .../clerie-update-nixfiles/clerie-update-nixfiles.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/clerie-update-nixfiles/clerie-update-nixfiles.sh b/pkgs/clerie-update-nixfiles/clerie-update-nixfiles.sh
index 4ac6a98..ea11c3d 100755
--- a/pkgs/clerie-update-nixfiles/clerie-update-nixfiles.sh
+++ b/pkgs/clerie-update-nixfiles/clerie-update-nixfiles.sh
@@ -20,25 +20,25 @@ xgit_merge_theirs() {
 
   # create a merge commit between base branch and other branch, so it shows up correctly in git log
   # we use `ours` so we make sure there are no merge conflicts
-  git merge -s ours "${OTHER_BRANCH}" -m "${COMMIT_MESSAGE}"
+  xgit merge -s ours "${OTHER_BRANCH}" -m "${COMMIT_MESSAGE}"
 
   # save our newly created merge commit in a seperate branch
-  git branch "${TEMP_BRANCH}"
+  xgit branch "${TEMP_BRANCH}"
 
   # export contents of other branch to current working directory
   # this will change the last commit of our base branch too
-  git reset --hard "${OTHER_BRANCH}"
+  xgit reset --hard "${OTHER_BRANCH}"
 
   # return to our merge commit from the base branch
   # but without touching the current working directory
-  git reset --soft "${TEMP_BRANCH}"
+  xgit reset --soft "${TEMP_BRANCH}"
 
   # Add the changes to our merge commit
-  git commit --amend --no-edit
+  xgit commit --amend --no-edit
 
   # we are now on our base branch again
   # so we can delete the temp branch
-  git branch -D "${TEMP_BRANCH}"
+  xgit branch -D "${TEMP_BRANCH}"
 }
 
 NOW="$(date --utc +%Y-%m-%d-%H-%M)"