git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[GUILT] [PATCH 4/7] Handle empty patches and patches with only a header.

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Jan 16, 2013, 02:28 UTC
Message-ID
<20130116022827.GM12524@google.com>
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
Previous: Jonathan NiederNext: Jonathan Nieder
Message 5 of 13 in “guilt patches, including git 1.8 support”
  1. 0/7 guilt patches, including git 1.8 supportJonathan Nieder, Jan 16, 2013
  2. [GUILT] [PATCH 1/7] get rid of "cat: write error: Broken pipe" error messageJonathan Nieder, Jan 16, 2013
  3. [GUILT] [PATCH 2/7] The tests should not fail if log.date or log.decorate are set.Jonathan Nieder, Jan 16, 2013
  4. [GUILT] [PATCH 3/7] Testsuite: get rid of "Broken pipe" errors from yes.Jonathan Nieder, Jan 16, 2013
  5. [GUILT] [PATCH 4/7] Handle empty patches and patches with only a header.Jonathan Nieder, Jan 16, 2013
  6. [GUILT] [PATCH 5/7] Fix fatal "guilt graph" error in sha1sum invocation.Jonathan Nieder, Jan 16, 2013
  7. [GUILT] [PATCH 6/7] Change git branch when patches are applied.Jonathan Nieder, Jan 16, 2013
  8. [GUILT] [PATCH 7/7] Drop unneeded git version check.Jonathan Nieder, Jan 16, 2013
  9. Theodore Ts'oJan 16, 2013
  10. Josef 'Jeff' SipekJan 16, 2013
  11. Per CederqvistJan 20, 2013
  12. Josef 'Jeff' SipekJan 20, 2013
  13. Josef 'Jeff' SipekJan 27, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.