summaryrefslogtreecommitdiff
path: root/src/libgit2/merge.c
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2022-01-17 13:40:37 -0500
committerEdward Thomson <ethomson@edwardthomson.com>2022-06-14 22:29:57 -0400
commit0acaf3a8eb7c3276b7864df8f5588c7007b38f35 (patch)
treea5f6a678339651be6c9681f84a489950d34b9fb2 /src/libgit2/merge.c
parentdbc4ac1c76827e954e0aa27afe8bb7e0b8993a93 (diff)
downloadlibgit2-0acaf3a8eb7c3276b7864df8f5588c7007b38f35.tar.gz
oid: define GIT_OID_SHA1_ZERO
Callers should not assume the layout of the oid structure; provide them a macro that defines the null / zero sha1 object id.
Diffstat (limited to 'src/libgit2/merge.c')
-rw-r--r--src/libgit2/merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libgit2/merge.c b/src/libgit2/merge.c
index 01f60abc5..e4db2629c 100644
--- a/src/libgit2/merge.c
+++ b/src/libgit2/merge.c
@@ -1061,7 +1061,7 @@ static int index_entry_similarity_calc(
const git_merge_options *opts)
{
git_blob *blob;
- git_diff_file diff_file = {{{0}}};
+ git_diff_file diff_file = { GIT_OID_SHA1_ZERO };
git_object_size_t blobsize;
int error;