str: introduce `git_str` for internal, `git_buf` is externalethomson/gitstr

libgit2 has two distinct requirements that were previously solved by
`git_buf`.  We require:

1. A general purpose string class that provides a number of utility APIs
   for manipulating data (eg, concatenating, truncating, etc).
2. A structure that we can use to return strings to callers that they
   can take ownership of.

By using a single class (`git_buf`) for both of these purposes, we have
confused the API to the point that refactorings are difficult and
reasoning about correctness is also difficult.

Move the utility class `git_buf` to be called `git_str`: this represents
its general purpose, as an internal string buffer class.  The name also
is an homage to Junio Hamano ("gitstr").

The public API remains `git_buf`, and has a much smaller footprint.  It
is generally only used as an "out" param with strict requirements that
follow the documentation.  (Exceptions exist for some legacy APIs to
avoid breaking callers unnecessarily.)

Utility functions exist to convert a user-specified `git_buf` to a
`git_str` so that we can call internal functions, then converting it
back again.

1 files changed, 9 insertions, 9 deletions

diff --git a/tests/reset/soft.c b/tests/reset/soft.c
index d9cfb0553..aca0834f2 100644
--- a/tests/reset/soft.c
+++ b/tests/reset/soft.c
@@ -116,33 +116,33 @@ void test_reset_soft__resetting_against_an_unborn_head_repo_makes_the_head_no_lo
 
 void test_reset_soft__fails_when_merging(void)
 {
-	git_buf merge_head_path = GIT_BUF_INIT;
+	git_str merge_head_path = GIT_STR_INIT;
 
 	cl_git_pass(git_repository_detach_head(repo));
-	cl_git_pass(git_buf_joinpath(&merge_head_path, git_repository_path(repo), "MERGE_HEAD"));
-	cl_git_mkfile(git_buf_cstr(&merge_head_path), "beefbeefbeefbeefbeefbeefbeefbeefbeefbeef\n");
+	cl_git_pass(git_str_joinpath(&merge_head_path, git_repository_path(repo), "MERGE_HEAD"));
+	cl_git_mkfile(git_str_cstr(&merge_head_path), "beefbeefbeefbeefbeefbeefbeefbeefbeefbeef\n");
 
 	cl_git_pass(git_revparse_single(&target, repo, KNOWN_COMMIT_IN_BARE_REPO));
 
 	cl_assert_equal_i(GIT_EUNMERGED, git_reset(repo, target, GIT_RESET_SOFT, NULL));
-	cl_git_pass(p_unlink(git_buf_cstr(&merge_head_path)));
+	cl_git_pass(p_unlink(git_str_cstr(&merge_head_path)));
 
-	git_buf_dispose(&merge_head_path);
+	git_str_dispose(&merge_head_path);
 }
 
 void test_reset_soft__fails_when_index_contains_conflicts_independently_of_MERGE_HEAD_file_existence(void)
 {
 	git_index *index;
 	git_reference *head;
-	git_buf merge_head_path = GIT_BUF_INIT;
+	git_str merge_head_path = GIT_STR_INIT;
 
 	cl_git_sandbox_cleanup();
 
 	repo = cl_git_sandbox_init("mergedrepo");
 
-	cl_git_pass(git_buf_joinpath(&merge_head_path, git_repository_path(repo), "MERGE_HEAD"));
-	cl_git_pass(p_unlink(git_buf_cstr(&merge_head_path)));
-	git_buf_dispose(&merge_head_path);
+	cl_git_pass(git_str_joinpath(&merge_head_path, git_repository_path(repo), "MERGE_HEAD"));
+	cl_git_pass(p_unlink(git_str_cstr(&merge_head_path)));
+	git_str_dispose(&merge_head_path);
 
 	cl_git_pass(git_repository_index(&index, repo));
 	cl_assert_equal_i(true, git_index_has_conflicts(index));