From 71f35d5cbc0336ca5dca6b638c31d96611d301a7 Mon Sep 17 00:00:00 2001 From: "brian m. carlson" Date: Sat, 6 May 2017 22:09:57 +0000 Subject: submodule: convert merge_submodule to use struct object_id This is a caller of lookup_commit_reference, which we will convert later. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano --- submodule.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'submodule.h') diff --git a/submodule.h b/submodule.h index 1277480add..89c2ed2191 100644 --- a/submodule.h +++ b/submodule.h @@ -84,10 +84,10 @@ extern int submodule_uses_gitfile(const char *path); #define SUBMODULE_REMOVAL_IGNORE_UNTRACKED (1<<1) #define SUBMODULE_REMOVAL_IGNORE_IGNORED_UNTRACKED (1<<2) extern int bad_to_remove_submodule(const char *path, unsigned flags); -extern int merge_submodule(unsigned char result[20], const char *path, - const unsigned char base[20], - const unsigned char a[20], - const unsigned char b[20], int search); +extern int merge_submodule(struct object_id *result, const char *path, + const struct object_id *base, + const struct object_id *a, + const struct object_id *b, int search); extern int find_unpushed_submodules(struct oid_array *commits, const char *remotes_name, struct string_list *needs_pushing); -- cgit v1.3