From 860ae5cfe7630d0dc68b7a4123ab4f80b3364f9f Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Date: Wed, 1 Apr 2026 20:40:42 +0300
Subject: [PATCH] Improve error output when git commit fails

---
 cherry_picker/cherry_picker.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/cherry_picker/cherry_picker.py b/cherry_picker/cherry_picker.py
index 55a0f26..27aa2f0 100755
--- a/cherry_picker/cherry_picker.py
+++ b/cherry_picker/cherry_picker.py
@@ -233,7 +233,11 @@ def run_cmd(self, cmd, required_real_result=False):
         if not required_real_result and self.dry_run:
             click.echo(f"  dry-run: {' '.join(cmd)}")
             return
-        output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
+        try:
+            output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
+        except subprocess.CalledProcessError as exc:
+            click.echo(exc.output.decode("utf-8"))
+            raise
         return output.decode("utf-8")
 
     def checkout_branch(self, branch_name, *, create_branch=False):