From 77c23542cbb03aa12417f663ad59fc7ec758c825 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 17 Apr 2016 15:00:39 +0200 Subject: [PATCH] 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) --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7723c720..9490f5a9 100644 --- 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' -- 2.16.6