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.

2 files changed, 12 insertions, 2 deletions

diff --git a/src/branch.c b/src/branch.c
index 03892a4b0..cc42903f2 100644
--- a/src/branch.c
+++ b/src/branch.c
@@ -123,7 +123,12 @@ 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];
+
+	if (git_oid_tostr(commit_id, GIT_OID_HEXSZ + 1, git_commit_id(commit)) < 0)
+		return -1;
+
+	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..5c645f23a 100644
--- a/src/reset.c
+++ b/src/reset.c
@@ -188,7 +188,12 @@ 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];
+
+	if (git_oid_tostr(to, GIT_OID_HEXSZ + 1, git_object_id(target)) < 0)
+		return -1;
+
+	return reset(repo, target, to, reset_type, checkout_opts);
 }
 
 int git_reset_from_annotated(