diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2022-01-21 19:43:42 -0500 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2022-01-27 20:15:09 -0500 |
| commit | a9fc14b0f515ec8d27ac7c854c2884b27ebd079e (patch) | |
| tree | c0a8e7579684fa8be08a7626b65103d6491d29b6 | |
| parent | 74471eefcea752542a2a6ee5e15b75b6baf05a48 (diff) | |
| download | libgit2-a9fc14b0f515ec8d27ac7c854c2884b27ebd079e.tar.gz | |
oid: avoid `tostr_s` in many places
The `git_oid_tostr_s` helper is indeed helpful, unless you are using
printf debugging (by inserting more `git_oid_tostr_s` calls) shortly
after using it. Avoid it before invoking complex functions.
| -rw-r--r-- | src/branch.c | 5 | ||||
| -rw-r--r-- | src/reset.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/branch.c b/src/branch.c index 03892a4b0..2e29af99d 100644 --- a/src/branch.c +++ b/src/branch.c @@ -123,7 +123,10 @@ int git_branch_create( const git_commit *commit, int force) { - return create_branch(ref_out, repository, branch_name, commit, git_oid_tostr_s(git_commit_id(commit)), force); + char commit_id[GIT_OID_HEXSZ + 1]; + + git_oid_tostr(commit_id, GIT_OID_HEXSZ + 1, git_commit_id(commit)); + return create_branch(ref_out, repository, branch_name, commit, commit_id, force); } int git_branch_create_from_annotated( diff --git a/src/reset.c b/src/reset.c index b8327fe5e..e0d942e5e 100644 --- a/src/reset.c +++ b/src/reset.c @@ -188,7 +188,10 @@ int git_reset( git_reset_t reset_type, const git_checkout_options *checkout_opts) { - return reset(repo, target, git_oid_tostr_s(git_object_id(target)), reset_type, checkout_opts); + char to[GIT_OID_HEXSZ + 1]; + + git_oid_tostr(to, GIT_OID_HEXSZ + 1, git_object_id(target)); + return reset(repo, target, to, reset_type, checkout_opts); } int git_reset_from_annotated( |