aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-04-17 15:00:39 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-04-17 15:04:59 +0200
commitfa47cae0599281bf3ae3c8d7b4816b22d39e3583 (patch)
tree79959c5883dc20a639eff3d6741587ba8a5891cb
parentbc97394b41507955e58793df6859882ebb540ee4 (diff)
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
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
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'