Skip to content

Commit 60e96f3

Browse files
authored
Merge of #1315
2 parents b35651e + 525f374 commit 60e96f3

1 file changed

Lines changed: 12 additions & 2 deletions

File tree

mergify_cli/stack/push.py

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
import sys
2525
import typing
2626

27+
import rich.markup
28+
2729
from mergify_cli import console
2830
from mergify_cli import console_error
2931
from mergify_cli import utils
@@ -582,8 +584,16 @@ async def stack_push(
582584
with console.status("Fetching old PR heads for comparison..."):
583585
try:
584586
await fetch_old_pr_heads(remote, updated_pr_numbers)
585-
except utils.CommandError:
586-
pass # Non-fatal: change type will be "unknown"
587+
except utils.CommandError as exc:
588+
# Non-fatal: change type will be "unknown" — but surface
589+
# the underlying error so the user can fix it. Escape the
590+
# exception text since it can contain `[`/`]` that Rich
591+
# would otherwise interpret as markup tags.
592+
console.log(
593+
f"[orange]Could not fetch old PR heads; revision-history "
594+
f"change types will fall back to 'unknown': "
595+
f"{rich.markup.escape(str(exc))}[/]",
596+
)
587597

588598
# Detect change types before force-push overwrites refs
589599
change_types: dict[str, str] = {}

0 commit comments

Comments
 (0)