diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-04-17 15:00:39 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-02 14:28:25 +0000 |
| commit | 77c23542cbb03aa12417f663ad59fc7ec758c825 (patch) | |
| tree | 81c9ae422786324968fcefd091a47f6e2caf577e | |
| parent | 8963a089f6650c89006caf70f7ae5c90ae3856ac (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
(cherry picked from commit fa47cae0599281bf3ae3c8d7b4816b22d39e3583)
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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' |