From 4ffc4372dff6595a86120ec0bd311c4cb5fb8ed6 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 May 2024 07:03:06 +0200 Subject: Merging upstream version 1.8.1+ds. Signed-off-by: Daniel Baumann --- examples/merge.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'examples/merge.c') diff --git a/examples/merge.c b/examples/merge.c index 460c06a..718c767 100644 --- a/examples/merge.c +++ b/examples/merge.c @@ -30,7 +30,7 @@ struct merge_options { git_annotated_commit **annotated; size_t annotated_count; - int no_commit : 1; + unsigned int no_commit : 1; }; static void print_usage(void) @@ -263,7 +263,7 @@ static int create_merge_commit(git_repository *repo, git_index *index, struct me sign, sign, NULL, msg, tree, - opts->annotated_count + 1, (const git_commit **)parents); + opts->annotated_count + 1, parents); check_lg2(err, "failed to create commit", NULL); /* We're done merging, cleanup the repository state */ -- cgit v1.2.3