Makefile: submodules-clean: Add 'git am --abort'.

Sometimes patches fail to apply cleanly on patches-import, usually
due to upstream changes.

submodules-clean removes tags and resets HEAD, so it should also
try aborting the git am command.

Change-Id: I7e839383cbcde60deaf9266f24512f985b0b642e
(cherry picked from commit fa47cae0599281bf3ae3c8d7b4816b22d39e3583)

diff --git a/Makefile b/Makefile
index 7723c72..9490f5a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,8 @@ submodules-init:
 # Cleans any changes made to submodules
 submodules-clean:
        @git submodule -q foreach \
-               'git checkout -q armband-workbench-root; \
+               'git am --abort; \
+                git checkout -q armband-workbench-root; \
                git branch -q -D armband-workbench; \
                git tag -d armband-workbench-root; \
                git reset -q --hard HEAD; git clean -xdff'