Merge branch 'es/local-atomic-push-failure-with-http'

diff --git a/Makefile b/Makefile
index 11ccea40716d9bbcef731f093e530a9b1aee0013..b11cdd4fe79234b57211d236930b0798416b8e6c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1062,6 +1062,7 @@ BUILTIN_OBJS += builtin/diff-index.o
 BUILTIN_OBJS += builtin/diff-tree.o
 BUILTIN_OBJS += builtin/diff.o
 BUILTIN_OBJS += builtin/difftool.o
+BUILTIN_OBJS += builtin/env--helper.o
 BUILTIN_OBJS += builtin/fast-export.o
 BUILTIN_OBJS += builtin/fetch-pack.o
 BUILTIN_OBJS += builtin/fetch.o