public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Per Cederqvist <cederp@opera•com>
To: Jeff Sipek <jeffpc@josefsipek•net>
Cc: git@vger•kernel.org
Cc: ceder@lysator•liu.se
Subject: [GUILT] [PATCH] Handle empty patches and patches with only a header.
Date: Mon, 30 Apr 2012 12:29:55 +0200	[thread overview]
Message-ID: <87haw1342k.fsf@opera.com> (raw)

"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

Signed-off-by: Per Cederqvist <cederp@opera•com>
---
 guilt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guilt b/guilt
index 5d619c5..66a671a 100755
--- a/guilt
+++ b/guilt
@@ -622,7 +622,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.7.10

next             reply	other threads:[~2012-04-30 10:30 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-30 10:29 Per Cederqvist [this message]
2012-04-30 16:48 ` [GUILT] [PATCH] Handle empty patches and patches with only a header Jeff Sipek
2012-05-02  6:27   ` Per Cederqvist

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:5d619c5 dfblob:66a671a )
 OR (
bs:"[GUILT] [PATCH] Handle empty patches and patches with only a header." )
	(help)

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=87haw1342k.fsf@opera.com \
    --to=cederp@opera$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=jeffpc@josefsipek$(echo .)net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox