[PATCH aiaiai 2/2] apply-patch: prefix diff output with '> '

Jacob Keller jacob.e.keller at intel.com
Fri Mar 28 09:08:32 PDT 2014

When aiaiai responds to a mailing list that is monitored by patchwork, a
failure to apply a diff can cause patchwork to generate false positive
"patches" due to the diff in the email. This patch modifies aiaiai so
that it prefixes the output of the command with a '> ' which will
prevent patchwork from recognizing this as a diff with a patch inlined
to the reply.

Signed-off-by: Jacob Keller <jacob.e.keller at intel.com>
 helpers/aiaiai-sh-functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helpers/aiaiai-sh-functions b/helpers/aiaiai-sh-functions
index b515cf02eba2..c17255aa2809 100644
--- a/helpers/aiaiai-sh-functions
+++ b/helpers/aiaiai-sh-functions
@@ -188,7 +188,7 @@ $(patch --merge=diff3 -p1 < .git/rebase-apply/patch 2>&1)
-$(git diff --no-color)
+$(git diff --no-color | sed 's/^/> /')
 		return 1

More information about the aiaiai mailing list