From: Per Cederqvist <ced...@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 <ced...@opera.com>
Acked-by: Jeff Sipek <jef...@josefsipek.net>
Signed-off-by: Jonathan Nieder <jrnie...@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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
