combine-diff: convert diff_tree_combined to struct object_id

diff --git a/submodule.h b/submodule.h
index 89c2ed219177d07db5529bbac2d2a7996572f387..8fb0f25498d58344adb86fee53770bb11cf36cbc 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -49,6 +49,10 @@ extern int is_submodule_initialized(const char *path);
  * Otherwise the return error code is the same as of resolve_gitdir_gently.
  */
 extern int is_submodule_populated_gently(const char *path, int *return_error_code);
+extern void die_in_unpopulated_submodule(const struct index_state *istate,
+                                        const char *prefix);
+extern void die_path_inside_submodule(const struct index_state *istate,
+                                     const struct pathspec *ps);
 extern int parse_submodule_update_strategy(const char *value,
                struct submodule_update_strategy *dst);
 extern const char *submodule_strategy_to_string(const struct submodule_update_strategy *s);