From: Per Cederqvist <cederp@opera.com>
Date: Mon, 30 Apr 2012 10:29:55 GMT
Subject: [GUILT] [PATCH] Handle empty patches and patches with only a header.
Message-ID: <87haw1342k.fsf@opera.com>

"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