diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2016-06-24 23:09:28 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-28 11:39:02 -0700 |
| commit | 4e8161a82e5449976392517968b2d1bb56109b29 (patch) | |
| tree | 552b128d238cb8ac3176ba31792a32866c390364 /merge-recursive.h | |
| parent | b4da9d62f91d66ab97815007105b42a2aa5846b5 (diff) | |
| download | git-4e8161a82e5449976392517968b2d1bb56109b29.tar.gz git-4e8161a82e5449976392517968b2d1bb56109b29.tar.xz | |
merge-recursive: convert merge_recursive_generic() to object_id
Convert this function and the git merge-recursive subcommand to use
struct object_id.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
| -rw-r--r-- | merge-recursive.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/merge-recursive.h b/merge-recursive.h index 52f0201f6..d415724ae 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -49,10 +49,10 @@ int merge_trees(struct merge_options *o, * virtual commits and call merge_recursive() proper. */ int merge_recursive_generic(struct merge_options *o, - const unsigned char *head, - const unsigned char *merge, + const struct object_id *head, + const struct object_id *merge, int num_ca, - const unsigned char **ca, + const struct object_id **ca, struct commit **result); void init_merge_options(struct merge_options *o); |