From: Per Cederqvist <cederp@opera.com>
Date: Fri, 21 Mar 2014 07:31:44 GMT
Subject: [GUILT 06/28] Fix and simplify the do_get_patch function.
Message-ID: <1395387126-13681-7-git-send-email-cederp@opera.com>
In-Reply-To: <1395387126-13681-1-git-send-email-cederp@opera.com>

When extracting the patch, we only want the actual patches.  We don't
want the "---" delimiter.  Simplify the extraction by simply deleting
everything before the first "diff " line.  (Use sed instead of awk to
simplify the code.)

Without this patch, "guilt fold" and "guilt push" sometimes fails if
guilt.diffstat is true.

Signed-off-by: Per Cederqvist <cederp@opera.com>
---
 guilt | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/guilt b/guilt
index 8701481..c59cd0f 100755
--- a/guilt
+++ b/guilt
@@ -332,12 +332,7 @@ do_make_header()
 # usage: do_get_patch patchfile
 do_get_patch()
 {
-	awk '
-BEGIN{}
-/^(diff |---$|--- )/ {patch = 1}
-patch == 1 {print $0}
-END{}
-' < "$1"
+	sed -n '/^diff /,$p' < "$1"
 }
 
 # usage: do_get_header patchfile
-- 
1.8.3.1