From bc686e06fa3699e2bceea54b73ce71a4772ab6fa Mon Sep 17 00:00:00 2001
From: bbhtt <bbhtt.zn0i8@slmail.me>
Date: Sun, 8 Jun 2025 07:40:29 +0530
Subject: [PATCH] merge: Print stdout and stderr from git push only if it
 exists

---
 .github/actions/merge/entrypoint.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/actions/merge/entrypoint.py b/.github/actions/merge/entrypoint.py
index 9deb576..5d6ee11 100755
--- a/.github/actions/merge/entrypoint.py
+++ b/.github/actions/merge/entrypoint.py
@@ -253,8 +253,11 @@ def main():
         stdout=subprocess.PIPE,
         stderr=subprocess.STDOUT,
     )
-    print(ret.stdout)
-    print(ret.stderr)
+    if ret.stdout:
+        print(f"Git push stdout:\n{ret.stdout.decode().strip()}")
+    if ret.stderr:
+        print(f"Git push stderr:\n{ret.stderr.decode().strip()}")
+
     repo.remove_from_collaborators("flathubbot")
 
     print("Setting protected branches")