"Eric W. Biederman" <ebiederm@xxxxxxxxxxxx> writes:
> I would like to see the SHA256 transition happen so I started playing
> with the k2204-transition-interop branch of brian m. carlson's tree.
I needed these tweaks to build the series standalone on 'master' (or
2.42). There are semantic merge conflicts with some topics in flight
when this is merged to 'seen', so it may take me a bit more time to
push the integration result.
Thanks.
builtin/fast-import.c | 2 +-
bulk-checkin.c | 2 +-
commit.c | 2 +-
object-file-convert.c | 4 ++--
pack-write.c | 1 +
5 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/builtin/fast-import.c b/builtin/fast-import.c
index 66c471bc73..93cc4a491c 100644
--- a/builtin/fast-import.c
+++ b/builtin/fast-import.c
@@ -784,7 +784,7 @@ struct pack_index_names {
static struct pack_index_names create_index(void)
{
- struct pack_index_names tmp = {};
+ struct pack_index_names tmp = { 0 };
struct pack_idx_entry **idx, **c, **last;
struct object_entry *e;
struct object_entry_pool *o;
diff --git a/bulk-checkin.c b/bulk-checkin.c
index 3206412a19..d63b3ffa01 100644
--- a/bulk-checkin.c
+++ b/bulk-checkin.c
@@ -264,7 +264,7 @@ static int deflate_blob_to_pack(struct bulk_checkin_packfile *state,
struct hashfile_checkpoint checkpoint = {0};
struct pack_idx_entry *idx = NULL;
const struct git_hash_algo *compat = the_repository->compat_hash_algo;
- struct object_id compat_oid = {};
+ struct object_id compat_oid = { 0 };
seekback = lseek(fd, 0, SEEK_CUR);
if (seekback == (off_t) -1)
diff --git a/commit.c b/commit.c
index 54f19ed032..2e2b805d5e 100644
--- a/commit.c
+++ b/commit.c
@@ -1654,7 +1654,7 @@ int commit_tree_extended(const char *msg, size_t msg_len,
struct strbuf buffer, compat_buffer;
struct strbuf sig = STRBUF_INIT, compat_sig = STRBUF_INIT;
struct object_id *parent_buf = NULL;
- struct object_id compat_oid = {};
+ struct object_id compat_oid = { 0 };
size_t i, nparents;
/* Not having i18n.commitencoding is the same as having utf-8 */
diff --git a/object-file-convert.c b/object-file-convert.c
index 2306e17dd5..148e61d24f 100644
--- a/object-file-convert.c
+++ b/object-file-convert.c
@@ -26,7 +26,7 @@ int repo_submodule_oid_to_algop(struct repository *repo,
for (i = 0; i < repo->index->cache_nr; i++) {
const struct cache_entry *ce = repo->index->cache[i];
- struct repository subrepo = {};
+ struct repository subrepo = { 0 };
int ret;
if (!S_ISGITLINK(ce->ce_mode))
@@ -205,7 +205,7 @@ static int convert_tag_object_step(struct object_file_convert_state *state)
const struct git_hash_algo *to = state->to;
struct strbuf *out = state->outbuf;
const char *buffer = state->buf;
- size_t payload_size, size = state->buf_len;;
+ size_t payload_size, size = state->buf_len;
struct object_id oid;
const char *p;
int ret = 0;
diff --git a/pack-write.c b/pack-write.c
index f22eea964f..b2ec09737e 100644
--- a/pack-write.c
+++ b/pack-write.c
@@ -7,6 +7,7 @@
#include "remote.h"
#include "chunk-format.h"
#include "pack-mtimes.h"
+#include "pack-compat-map.h"
#include "oidmap.h"
#include "pack-objects.h"
#include "pack-revindex.h"
--
2.42.0-158-g94e83dcf5b
