git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Jonas Flodén" <jonas@floden.nu>
To: git@vger.kernel.org
Cc: "Johannes Schindelin" <Johannes.Schindelin@gmx.de>
Subject: [PATCH/RFC] git-am: Make it easier to see which patch failed
Date: Fri, 16 Jan 2009 15:34:47 +0100	[thread overview]
Message-ID: <636ecac0901160634r586c72a0r9bb63c6f019f5bff@mail.gmail.com> (raw)
In-Reply-To: <alpine.DEB.1.00.0901161513400.3586@pacific.mpi-cbg.de>

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>
---
Johannes Schindelin wrote:
> Maybe
>
> -               echo Patch failed at $msgnum.
> +               echo Patch failed at $msgnum($FIRSTLINE).

How about this instead. Though the line could get very long.
This makes the line stand out a little more.

 git-am.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/git-am.sh b/git-am.sh
index 4b157fe..09c2f9c 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -501,7 +501,7 @@ do
 	fi
 	if test $apply_status != 0
 	then
-		echo Patch failed at $msgnum.
+		printf '\nPatch failed at %s (%s)\n' "$msgnum" "$FIRSTLINE"
 		stop_here_user_resolve $this
 	fi

-- 
1.6.1.28.gc32f76

  reply	other threads:[~2009-01-16 14:36 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-01-16 13:18 [PATCH/RFC] git-am: Make it easier to see which patch failed Jonas Flodén
2009-01-16 14:14 ` Johannes Schindelin
2009-01-16 14:34   ` Jonas Flodén [this message]
2009-01-16 16:27     ` Johannes Schindelin
2009-01-18  5:42     ` Junio C Hamano
2009-01-18  9:41       ` Stephan Beyer
2009-01-18  9:53         ` Stephan Beyer
2009-01-18 15:39         ` Jeff King
2009-01-18 16:17           ` Johannes Schindelin
2009-01-18 16:49             ` Thomas Rast
2009-01-18 16:53             ` Stephan Beyer
2009-01-18 17:07             ` Jeff King
2009-01-18 17:44               ` Johannes Schindelin
2009-01-18 17:49                 ` Jeff King
2009-01-19  3:38           ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=636ecac0901160634r586c72a0r9bb63c6f019f5bff@mail.gmail.com \
    --to=jonas@floden.nu \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).