* [PATCH] git-am: print fair error message when format detection fails
@ 2009-07-14 6:39 Nicolas Sebrecht
2009-07-14 7:10 ` Giuseppe Bilotta
0 siblings, 1 reply; 2+ messages in thread
From: Nicolas Sebrecht @ 2009-07-14 6:39 UTC (permalink / raw)
To: git; +Cc: Giuseppe Bilotta, Nicolas Sebrecht
Avoid git ending with this message:
"Patch format is not supported."
Signed-off-by: Nicolas Sebrecht <ni.s@laposte.net>
---
git-am.sh | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/git-am.sh b/git-am.sh
index d64d997..ca73c88 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -254,7 +254,11 @@ split_patches () {
msgnum=
;;
*)
- clean_abort "Patch format $patch_format is not supported."
+ if test -n "$parse_patch" ; then
+ clean_abort "Patch format $patch_format is not supported."
+ else
+ clean_abort "Format patch detection failed."
+ fi
;;
esac
}
--
1.6.4.rc0.121.g2937a.dirty
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] git-am: print fair error message when format detection fails
2009-07-14 6:39 [PATCH] git-am: print fair error message when format detection fails Nicolas Sebrecht
@ 2009-07-14 7:10 ` Giuseppe Bilotta
0 siblings, 0 replies; 2+ messages in thread
From: Giuseppe Bilotta @ 2009-07-14 7:10 UTC (permalink / raw)
To: Nicolas Sebrecht; +Cc: git
On Tue, Jul 14, 2009 at 8:39 AM, Nicolas Sebrecht<ni.s@laposte.net> wrote:
> Avoid git ending with this message:
> "Patch format is not supported."
>
> Signed-off-by: Nicolas Sebrecht <ni.s@laposte.net>
> ---
> git-am.sh | 6 +++++-
> 1 files changed, 5 insertions(+), 1 deletions(-)
>
> diff --git a/git-am.sh b/git-am.sh
> index d64d997..ca73c88 100755
> --- a/git-am.sh
> +++ b/git-am.sh
> @@ -254,7 +254,11 @@ split_patches () {
> msgnum=
> ;;
> *)
> - clean_abort "Patch format $patch_format is not supported."
> + if test -n "$parse_patch" ; then
> + clean_abort "Patch format $patch_format is not supported."
> + else
> + clean_abort "Format patch detection failed."
"Patch format detection failed" maybe?
> + fi
> ;;
> esac
> }
> --
> 1.6.4.rc0.121.g2937a.dirty
--
Giuseppe "Oblomov" Bilotta
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-07-14 7:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-07-14 6:39 [PATCH] git-am: print fair error message when format detection fails Nicolas Sebrecht
2009-07-14 7:10 ` Giuseppe Bilotta
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).