]> www.infradead.org Git - users/dedekind/aiaiai.git/commit
aiaiai: extract patches from email prior to using git-am
authorJacob Keller <jacob.e.keller@intel.com>
Wed, 9 Apr 2014 22:26:06 +0000 (15:26 -0700)
committerArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Fri, 25 Apr 2014 22:37:45 +0000 (15:37 -0700)
commit9c9115178efdcf0f6457cc68c6ba00de6ec2df9a
tree633869d80f6457e386926571b949bf35be18c5a0
parentf491665839e8b033d4e20cfe2ea1c66609f2adde
aiaiai: extract patches from email prior to using git-am

Some patch authors submit patches directly attached via git-format-patch
output as an attachment. Sometimes they include both the patch and the
inline diff. This is problematic because it causes aiaiai to fail to
apply the patch, due to git being confused about the attached patch.
This patch modifies how aiaiai reads the commits, using a python script
which is capable of extracting the patches from the mbox (including
attachments) before calling git-am.

This helps aiaiai more easily handle this weird patch case, and still
works great for regular patch submissions. In addition, turn on 3-way
merge of git-am, so that duplicate patches will be properly ignored (as
in the case with inlined and attached patches)

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
helpers/aiaiai-extract-patches [new file with mode: 0755]
helpers/aiaiai-sh-functions