From dc8d18af6c92a24b659c0edb41d510ba9d0887bb Mon Sep 17 00:00:00 2001
From: flu0r1ne <flu0r1ne@flu0r1ne.net>
Date: Wed, 8 Sep 2021 18:06:05 -0500
Subject: Abort merge w/o failing out when no merge occurs

---
 git-update-agent | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/git-update-agent b/git-update-agent
index 7a0b98d..6d1ebdb 100755
--- a/git-update-agent
+++ b/git-update-agent
@@ -116,8 +116,8 @@ merge() {
 
   if [[ -n "$(git status --untracked-files=all --porcelain 2>/dev/null)" ]]; then
     # Abort rebase or merge if initiated
-    git merge --abort  &>/dev/null
-    git rebase --abort &>/dev/null
+    git merge --abort  &>/dev/null || true
+    git rebase --abort &>/dev/null || true
 
     stash
     STASHED="1"
-- 
cgit v1.2.3