From 140dab8e66d770c262047793abca9ed16d44f0b5 Mon Sep 17 00:00:00 2001 From: Alan Jenkins Date: Tue, 13 Mar 2012 12:50:46 -0400 Subject: [PATCH] [GUILT 1/6] Refuse to push corrupt patches "guilt push" would treat corrupt patches as empty, because "git apply --numstat" prints nothing on stdout. (You do get an error message on stderr, but then guilt says "Patch applied" etc, and I didn't notice the earlier error message for quite some time.) Signed-off-by: Alan Jenkins Signed-off-by: Josef 'Jeff' Sipek --- guilt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guilt b/guilt index b4e4c0b..d0a4bcd 100755 --- a/guilt +++ b/guilt @@ -619,7 +619,7 @@ push_patch() cd_to_toplevel # apply the patch if and only if there is something to apply - if [ `git apply --numstat "$p" | wc -l` -gt 0 ]; then + if [ `do_get_patch "$p" | wc -l` -gt 0 ]; then if [ "$bail_action" = abort ]; then reject="" fi