git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH/RFC] git-am: Make it easier to see which patch failed

From
JFJonas Flodén <jonas@floden.nu>
Date
Jan 16, 2009, 13:18 UTC
Message-ID
<636ecac0901160518o16706bbia9acaf09fdf92946@mail.gmail.com>

When git-am fails it's not always easy to see which patch failed, since it's often hidden by a lot of error messages. Add an extra line which prints the name of the failed patch just before the resolve message to make it easier to find.

Signed-off-by: Jonas Flodén <jonas@floden.nu>
---

This is something I have thought about for a long time. I always wonder why git rebase couldn't print the patch name when it failed... Finally I took the time to fix it. Please feel free to comment. It's my first Git patch...

With regards, Jonas

 git-am.sh |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/git-am.sh b/git-am.sh
index 4b157fe..5d72a66 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -502,6 +502,7 @@ do
 	if test $apply_status != 0
 	then
 		echo Patch failed at $msgnum.
+		printf '\nFailed to apply: %s\n' "$FIRSTLINE"
 		stop_here_user_resolve $this
 	fi
-- 
1.6.1.28.gc32f76
Next: Johannes Schindelin
Message 1 of 15 in “git-am: Make it easier to see which patch failed”
  1. git-am: Make it easier to see which patch failedJonas Flodén, Jan 16, 2009
  2. Johannes SchindelinJan 16, 2009
  3. git-am: Make it easier to see which patch failedJonas Flodén, Jan 16, 2009
  4. Johannes SchindelinJan 16, 2009
  5. Junio C HamanoJan 18, 2009
  6. Stephan BeyerJan 18, 2009
  7. Stephan BeyerJan 18, 2009
  8. Jeff KingJan 18, 2009
  9. Johannes SchindelinJan 18, 2009
  10. Thomas RastJan 18, 2009
  11. Stephan BeyerJan 18, 2009
  12. Jeff KingJan 18, 2009
  13. Johannes SchindelinJan 18, 2009
  14. Jeff KingJan 18, 2009
  15. Junio C HamanoJan 19, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.