diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-21 05:03:06 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-21 05:03:06 +0000 |
| commit | 4ffc4372dff6595a86120ec0bd311c4cb5fb8ed6 (patch) | |
| tree | 582224c3f88627b5797d1b57ccaf158c7d36118e /examples/merge.c | |
| parent | Releasing progress-linux version 1.7.2+ds-1~progress7.99u1. (diff) | |
| download | libgit2-4ffc4372dff6595a86120ec0bd311c4cb5fb8ed6.tar.xz libgit2-4ffc4372dff6595a86120ec0bd311c4cb5fb8ed6.zip | |
Merging upstream version 1.8.1+ds.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'examples/merge.c')
| -rw-r--r-- | examples/merge.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 */ |