Thread (61 messages) flat view 61 messages, 3 authors, 2016-06-15

[GUILT 06/28] Fix and simplify the do_get_patch function.

From: Per Cederqvist <hidden>
Date: 2016-06-15 23:00:24
Subsystem: the rest · Maintainer: Linus Torvalds

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 <redacted>
---
 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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help