Thanks for the patches. I looked them over and they look good. I'll give them another thorough reading once I have a bit of time to apply them. Jeff. On Wed, Sep 28, 2011 at 03:15:19PM +0100, Alan Jenkins wrote: > "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 <alan.christopher.jenkins@xxxxxxxxxxxxxx> > --- > guilt | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/guilt b/guilt > index d1e17d4..51532f9 100755 > --- a/guilt > +++ b/guilt > @@ -611,7 +611,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 > -- > 1.7.4.1 > -- Hegh QaQ law' quvHa'ghach QaQ puS -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html