From: Jonathan Nieder <jrnieder@gmail.com>
To: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Cc: git@vger.kernel.org, Per Cederqvist <cederp@opera.com>,
Theodore Ts'o <tytso@mit.edu>, Iulian Udrea <iulian@linux.com>,
Axel Beckert <abe@deuxchevaux.org>
Subject: [GUILT] [PATCH 4/7] Handle empty patches and patches with only a header.
Date: Tue, 15 Jan 2013 18:28:27 -0800 [thread overview]
Message-ID: <20130116022827.GM12524@google.com> (raw)
In-Reply-To: <20130116022606.GI12524@google.com>
From: Per Cederqvist <cederp@opera.com>
Date: Mon, 30 Apr 2012 12:29:55 +0200
"git apply --numstat" in Git 1.7.10 gives an error message unless the
patch contains a diff, so don't attempt to apply it unless we find a
'^diff'.
Signed-off-by: Per Cederqvist <cederp@opera.com>
Acked-by: Jeff Sipek <jeffpc@josefsipek.net>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
guilt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/guilt b/guilt
index 7f6806e..5bcc498 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 grep -q '^diff ' "$p" && [ `git apply --numstat "$p" | wc -l` -gt 0 ]; then
if [ "$bail_action" = abort ]; then
reject=""
fi
--
1.8.1
next prev parent reply other threads:[~2013-01-16 2:28 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-16 2:26 [PATCH 0/7] guilt patches, including git 1.8 support Jonathan Nieder
2013-01-16 2:27 ` [GUILT] [PATCH 1/7] get rid of "cat: write error: Broken pipe" error message Jonathan Nieder
2013-01-16 2:27 ` [GUILT] [PATCH 2/7] The tests should not fail if log.date or log.decorate are set Jonathan Nieder
2013-01-16 2:28 ` [GUILT] [PATCH 3/7] Testsuite: get rid of "Broken pipe" errors from yes Jonathan Nieder
2013-01-16 2:28 ` Jonathan Nieder [this message]
2013-01-16 2:29 ` [GUILT] [PATCH 5/7] Fix fatal "guilt graph" error in sha1sum invocation Jonathan Nieder
2013-01-16 2:30 ` [GUILT] [PATCH 6/7] Change git branch when patches are applied Jonathan Nieder
2013-01-16 2:31 ` [GUILT] [PATCH 7/7] Drop unneeded git version check Jonathan Nieder
2013-01-16 3:26 ` [PATCH 0/7] guilt patches, including git 1.8 support Theodore Ts'o
2013-01-16 15:04 ` Josef 'Jeff' Sipek
2013-01-20 21:19 ` Per Cederqvist
2013-01-20 21:24 ` Josef 'Jeff' Sipek
2013-01-27 14:38 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130116022827.GM12524@google.com \
--to=jrnieder@gmail.com \
--cc=abe@deuxchevaux.org \
--cc=cederp@opera.com \
--cc=git@vger.kernel.org \
--cc=iulian@linux.com \
--cc=jeffpc@josefsipek.net \
--cc=tytso@mit.edu \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).