merge: fix NULL pointer dereference when merging nothing into void

diff --git a/submodule.h b/submodule.h
index 5507c3d9a098b1da016855c1fa4233ffc6e0a8cf..ddff512109cbf24f0ead87676f1fc8e6cb92f897 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -5,6 +5,7 @@ struct diff_options;
 struct argv_array;
 
 enum {
+       RECURSE_SUBMODULES_CHECK = -4,
        RECURSE_SUBMODULES_ERROR = -3,
        RECURSE_SUBMODULES_NONE = -2,
        RECURSE_SUBMODULES_ON_DEMAND = -1,