mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-recursive: convert merge_recursive_generic() to object_id

Browse Source 
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>
This commit is contained in:
brian m. carlson
2016-06-24 23:09:28 +00:00
committed by Junio C Hamano
parent b4da9d62f9
commit 4e8161a82e
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
merge-recursive.h
View File

@ -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);