merge: handle FETCH_HEAD internally

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 792c66ca5932638e11f2587f928a6b98c08e7854..a369f5535351645f15b08efb9d592be4257cdeff 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -185,6 +185,9 @@ static void cleanup_thread(void)
 #define deepest_delta_lock()
 #define deepest_delta_unlock()
 
+#define type_cas_lock()
+#define type_cas_unlock()
+
 #endif