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

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

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 18, 2009, 05:42 UTC
Message-ID
<7vhc3x1874.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<636ecac0901160634r586c72a0r9bb63c6f019f5bff@mail.gmail.com>
"Jonas Flodén" <jonas@floden.nu> writes:
Show 31 quoted lines
> 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

Looks sane except that I do not think you need printf nor the leading blank line, i.e.

	echo "Patch failed at $msgnum ($FIRSTLINE)"
Previous: Johannes SchindelinNext: Stephan Beyer
Message 5 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.