diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2021-08-29 10:14:01 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2021-08-29 10:16:56 -0400 |
| commit | ef03e15038824c8951eede2f17ad9dafbd5a32d3 (patch) | |
| tree | cfc3926004f3fd402a1903b3657912ccfff53b57 /src | |
| parent | d3bdf33b58f16939a4fd43ab541dcd2ee535b6a3 (diff) | |
| download | libgit2-ethomson/commit_create_cb.tar.gz | |
rebase: deprecate signing_cbethomson/commit_create_cb
The signing callback should not be used; instead, callers should provide
a commit_create_cb, perform the signing and commit creation themselves.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rebase.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/rebase.c b/src/rebase.c index ddd82e910..4f10c296b 100644 --- a/src/rebase.c +++ b/src/rebase.c @@ -943,6 +943,7 @@ int git_rebase_inmemory_index( return 0; } +#ifndef GIT_DEPRECATE_HARD static int create_signed( git_oid *out, git_rebase *rebase, @@ -988,6 +989,7 @@ done: git_buf_dispose(&commit_content); return error; } +#endif static int rebase_commit__create( git_commit **out, @@ -1044,11 +1046,14 @@ static int rebase_commit__create( git_error_set_after_callback_function(error, "commit_create_cb"); - } else if (rebase->options.signing_cb) { + } +#ifndef GIT_DEPRECATE_HARD + else if (rebase->options.signing_cb) { error = create_signed(&commit_id, rebase, author, committer, message_encoding, message, tree, 1, (const git_commit **)&parent_commit); } +#endif if (error == GIT_PASSTHROUGH) error = git_commit_create(&commit_id, rebase->repo, NULL, |