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@xxxxxxxxx>
---
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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html