diff options
| -rw-r--r-- | defs/gmake.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/defs/gmake.mk b/defs/gmake.mk index 0929eda5ae..a376af59d4 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -320,5 +320,6 @@ update-deps: git -C $(deps_dir) diff --no-ext-diff --ignore-submodules --exit-code || \ git -C $(deps_dir) commit --all --message='Update dependencies' git --git-dir=$(GIT_DIR) worktree remove $(deps_dir) + $(RMDIR) $(dir $(deps_dir)) git --git-dir=$(GIT_DIR) merge --no-edit --ff-only $(update_deps) git --git-dir=$(GIT_DIR) branch --delete $(update_deps) |