summaryrefslogtreecommitdiff
path: root/tests/libgit2/diff
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2022-01-22 23:10:03 -0500
committerEdward Thomson <ethomson@edwardthomson.com>2022-06-14 22:29:57 -0400
commitdbc4ac1c76827e954e0aa27afe8bb7e0b8993a93 (patch)
tree56f18a11bca8d17490a176cddf9e3756c2cebe91 /tests/libgit2/diff
parentf98dd5438f8d7bfd557b612fdf1605b1c3fb8eaf (diff)
downloadlibgit2-dbc4ac1c76827e954e0aa27afe8bb7e0b8993a93.tar.gz
oid: `GIT_OID_*SZ` is now `GIT_OID_SHA1_*SIZE`
In preparation for SHA256 support, `GIT_OID_RAWSZ` and `GIT_OID_HEXSZ` need to indicate that they're the size of _SHA1_ OIDs.
Diffstat (limited to 'tests/libgit2/diff')
-rw-r--r--tests/libgit2/diff/binary.c16
-rw-r--r--tests/libgit2/diff/parse.c2
2 files changed, 9 insertions, 9 deletions
diff --git a/tests/libgit2/diff/binary.c b/tests/libgit2/diff/binary.c
index 4e71f39c6..284a1b1af 100644
--- a/tests/libgit2/diff/binary.c
+++ b/tests/libgit2/diff/binary.c
@@ -100,7 +100,7 @@ void test_diff_binary__add(void)
"\n";
opts.flags = GIT_DIFF_SHOW_BINARY;
- opts.id_abbrev = GIT_OID_HEXSZ;
+ opts.id_abbrev = GIT_OID_SHA1_HEXSIZE;
repo = cl_git_sandbox_init("diff_format_email");
test_patch(
@@ -183,7 +183,7 @@ void test_diff_binary__delete(void)
"\n";
opts.flags = GIT_DIFF_SHOW_BINARY;
- opts.id_abbrev = GIT_OID_HEXSZ;
+ opts.id_abbrev = GIT_OID_SHA1_HEXSIZE;
repo = cl_git_sandbox_init("diff_format_email");
test_patch(
@@ -215,7 +215,7 @@ void test_diff_binary__delta(void)
"\n";
opts.flags = GIT_DIFF_SHOW_BINARY | GIT_DIFF_FORCE_BINARY;
- opts.id_abbrev = GIT_OID_HEXSZ;
+ opts.id_abbrev = GIT_OID_SHA1_HEXSIZE;
repo = cl_git_sandbox_init("renames");
cl_git_pass(git_repository_index(&index, repo));
@@ -257,7 +257,7 @@ void test_diff_binary__delta_append(void)
"\n";
opts.flags = GIT_DIFF_SHOW_BINARY | GIT_DIFF_FORCE_BINARY;
- opts.id_abbrev = GIT_OID_HEXSZ;
+ opts.id_abbrev = GIT_OID_SHA1_HEXSIZE;
repo = cl_git_sandbox_init("renames");
cl_git_pass(git_repository_index(&index, repo));
@@ -285,7 +285,7 @@ void test_diff_binary__empty_for_no_diff(void)
git_str actual = GIT_STR_INIT;
opts.flags = GIT_DIFF_SHOW_BINARY | GIT_DIFF_FORCE_BINARY;
- opts.id_abbrev = GIT_OID_HEXSZ;
+ opts.id_abbrev = GIT_OID_SHA1_HEXSIZE;
repo = cl_git_sandbox_init("renames");
@@ -323,7 +323,7 @@ void test_diff_binary__index_to_workdir(void)
"\n";
opts.flags = GIT_DIFF_SHOW_BINARY | GIT_DIFF_FORCE_BINARY;
- opts.id_abbrev = GIT_OID_HEXSZ;
+ opts.id_abbrev = GIT_OID_SHA1_HEXSIZE;
repo = cl_git_sandbox_init("renames");
cl_git_pass(git_repository_index(&index, repo));
@@ -389,7 +389,7 @@ void test_diff_binary__print_patch_from_diff(void)
"\n";
opts.flags = GIT_DIFF_SHOW_BINARY | GIT_DIFF_FORCE_BINARY;
- opts.id_abbrev = GIT_OID_HEXSZ;
+ opts.id_abbrev = GIT_OID_SHA1_HEXSIZE;
repo = cl_git_sandbox_init("renames");
cl_git_pass(git_repository_index(&index, repo));
@@ -501,7 +501,7 @@ void test_diff_binary__blob_to_blob(void)
struct diff_data diff_data = {0};
opts.flags = GIT_DIFF_SHOW_BINARY | GIT_DIFF_FORCE_BINARY;
- opts.id_abbrev = GIT_OID_HEXSZ;
+ opts.id_abbrev = GIT_OID_SHA1_HEXSIZE;
repo = cl_git_sandbox_init("renames");
cl_git_pass(git_repository_index__weakptr(&index, repo));
diff --git a/tests/libgit2/diff/parse.c b/tests/libgit2/diff/parse.c
index 9c3f798e4..cae843cc8 100644
--- a/tests/libgit2/diff/parse.c
+++ b/tests/libgit2/diff/parse.c
@@ -151,7 +151,7 @@ static void test_tree_to_tree_computed_to_parsed(
repo = cl_git_sandbox_init(sandbox);
- opts.id_abbrev = GIT_OID_HEXSZ;
+ opts.id_abbrev = GIT_OID_SHA1_HEXSIZE;
opts.flags = GIT_DIFF_SHOW_BINARY | diff_flags;
findopts.flags = find_flags;