diff options
| author | Etienne Samson <samson.etienne@gmail.com> | 2018-01-17 02:25:36 +0100 |
|---|---|---|
| committer | Etienne Samson <samson.etienne@gmail.com> | 2018-01-25 22:14:39 +0100 |
| commit | cc845595f00808a12044aaf7446c10df3c96f8f7 (patch) | |
| tree | 6fea3aefc36bfd8b85260c8ab287a11d2089412f | |
| parent | 5ce4f19bced58bbb14c3f6fe8f171440ee7f0a07 (diff) | |
| download | libgit2-cc845595f00808a12044aaf7446c10df3c96f8f7.tar.gz | |
examples: fix remaining review comments
| -rw-r--r-- | examples/merge.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/examples/merge.c b/examples/merge.c index 15df7d0ea..206a8c465 100644 --- a/examples/merge.c +++ b/examples/merge.c @@ -244,6 +244,7 @@ static int create_merge_commit(git_repository *repo, git_index *index, merge_opt check_lg2(git_repository_head(&head_ref, repo), "failed to get repo HEAD", NULL); if (resolve_refish(&merge_commit, repo, opts->heads[0])) { fprintf(stderr, "failed to resolve refish %s", opts->heads[0]); + return -1; } /* Maybe that's a ref, so DWIM it */ @@ -293,6 +294,7 @@ static int create_merge_commit(git_repository *repo, git_index *index, merge_opt git_repository_state_cleanup(repo); cleanup: + free(parents); return err; } |