From 8da330e118a67f840010adc0409111a32a251523 Mon Sep 17 00:00:00 2001
From: Jerry Zhang <jerry@skydio.com>
Date: Sat, 28 Dec 2024 15:41:23 -0500
Subject: [PATCH] git: Don't swallow all push output

Topic: outp
---
 revup/shell.py       | 2 +-
 revup/topic_stack.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/revup/shell.py b/revup/shell.py
index 654bdfe..b965e98 100644
--- a/revup/shell.py
+++ b/revup/shell.py
@@ -69,7 +69,7 @@ async def process_stream(
         except asyncio.IncompleteReadError as e:
             line = e.partial
         if not line:
-            if isinstance(setting, int) and setting != -1:
+            if isinstance(setting, int) and setting not in (-1, subprocess.PIPE, subprocess.STDOUT):
                 os.close(setting)
             break
         if setting == subprocess.PIPE:
diff --git a/revup/topic_stack.py b/revup/topic_stack.py
index 335d540..a15dd5e 100644
--- a/revup/topic_stack.py
+++ b/revup/topic_stack.py
@@ -1039,7 +1039,7 @@ async def push_git_refs(self, uploader: str, create_local_branches: bool) -> Non
                 self.git_ctx.remote_name,
                 *push_targets,
             ]
-            await self.git_ctx.git(*push_args, stderr=subprocess.PIPE)
+            await self.git_ctx.git(*push_args, stdout=subprocess.STDOUT, stderr=subprocess.STDOUT)
 
     async def query_github(self) -> None:
         """