diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2017-05-07 01:09:57 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-08 09:12:56 +0300 |
| commit | 71f35d5cbc0336ca5dca6b638c31d96611d301a7 (patch) | |
| tree | 3b707f9f55c7fe37d5a7e817ac532ea943ef64a8 /submodule.h | |
| parent | 912c13d58faf355589a3f67fd55b2015561e0184 (diff) | |
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 <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'submodule.h')
| -rw-r--r-- | submodule.h | 8 |
1 files changed, 4 insertions, 4 deletions
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); |