diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2019-01-10 22:39:56 +0000 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2019-01-22 22:30:37 +0000 |
| commit | fcc7dcb1762bbc01ef0088b4cc866ca712622e3a (patch) | |
| tree | 8da31905b787a336433e8c262d54db7b7f391403 /examples/merge.c | |
| parent | 115a6c50c9c67bdf952304a3ed6a24673b42b815 (diff) | |
| download | libgit2-fcc7dcb1762bbc01ef0088b4cc866ca712622e3a.tar.gz | |
errors: remove giterr usage in examples
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 761bd3a75..13e3f9632 100644 --- a/examples/merge.c +++ b/examples/merge.c @@ -96,7 +96,7 @@ static int resolve_heads(git_repository *repo, merge_options *opts) for (i = 0; i < opts->heads_count; i++) { err = resolve_refish(&annotated[annotated_count++], repo, opts->heads[i]); if (err != 0) { - fprintf(stderr, "failed to resolve refish %s: %s\n", opts->heads[i], giterr_last()->message); + fprintf(stderr, "failed to resolve refish %s: %s\n", opts->heads[i], git_error_last()->message); annotated_count--; continue; } @@ -229,7 +229,7 @@ static int create_merge_commit(git_repository *repo, git_index *index, merge_opt /* Maybe that's a ref, so DWIM it */ err = git_reference_dwim(&merge_ref, repo, opts->heads[0]); - check_lg2(err, "failed to DWIM reference", giterr_last()->message); + check_lg2(err, "failed to DWIM reference", git_error_last()->message); /* Grab a signature */ check_lg2(git_signature_now(&sign, "Me", "me@example.com"), "failed to create signature", NULL); |