Abort no-commit merge only if not up-to-date

galaxyproject · Feb 19, 2024 · 7f65015 · 7f65015
1 parent aa87c15
commit 7f65015
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/galaxy_release_util/point_release.py b/galaxy_release_util/point_release.py
@@ -462,9 +462,10 @@ def is_merge_required(base_branch: str, new_branch: str, galaxy_root: pathlib.Pa
     process = subprocess.run(
         ["git", "merge", "--no-commit", "--no-ff", base_branch],
         cwd=galaxy_root,
-        capture_output=False,
+        capture_output=True,
     )
-    subprocess.run(["git", "merge", "--abort"], cwd=galaxy_root)
+    if not process.stdout == b"Already up to date.\n":
+        subprocess.run(["git", "merge", "--abort"], cwd=galaxy_root)
     if process.returncode == 0:
         return False
     return True