From: Alan Jenkins <alan.christopher.jenkins@googlemail.com>
To: jeffpc@josefsipek.net
Cc: git@vger.kernel.org,
Alan Jenkins <alan.christopher.jenkins@googlemail.com>
Subject: [GUILT 1/6] Refuse to push corrupt patches
Date: Wed, 28 Sep 2011 15:15:19 +0100 [thread overview]
Message-ID: <1317219324-10319-1-git-send-email-alan.christopher.jenkins@googlemail.com> (raw)
"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@googlemail.com>
---
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
next reply other threads:[~2011-09-28 14:15 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-28 14:15 Alan Jenkins [this message]
2011-09-28 14:15 ` [GUILT 2/6] guilt-header: fix patch corruption Alan Jenkins
2011-09-28 14:15 ` [GUILT 3/6] Handle paths that contain spaces Alan Jenkins
2011-09-28 14:15 ` [GUILT 4/6] Run regression tests in a directory which contains spaces Alan Jenkins
2011-09-28 14:15 ` [GUILT 5/6] Allow guilt scripts to be run from " Alan Jenkins
2011-09-28 14:15 ` [GUILT 6/6] Allow the regression tests to be run from a directory with spaces in Alan Jenkins
2011-09-30 17:15 ` [GUILT 1/6] Refuse to push corrupt patches Josef 'Jeff' Sipek
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=1317219324-10319-1-git-send-email-alan.christopher.jenkins@googlemail.com \
--to=alan.christopher.jenkins@googlemail.com \
--cc=git@vger.kernel.org \
--cc=jeffpc@josefsipek.net \
/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).