Merge branch 'sh/use-hashcpy'

* sh/use-hashcpy:
Use hashcpy() when copying object names

diff --git a/bundle.c b/bundle.c
index 1388a3e6fdf352fe670e4236f305c1b1e97b74f2..a85e0e4532ad10934b3d9c510db9e26b338f14f1 100644 (file)
--- a/bundle.c
+++ b/bundle.c
@@ -15,7 +15,7 @@ static void add_to_ref_list(const unsigned char *sha1, const char *name,
                struct ref_list *list)
 {
        ALLOC_GROW(list->list, list->nr + 1, list->alloc);
-       memcpy(list->list[list->nr].sha1, sha1, 20);
+       hashcpy(list->list[list->nr].sha1, sha1);
        list->list[list->nr].name = xstrdup(name);
        list->nr++;
 }

diff --git a/grep.c b/grep.c
index c668034739258d0cd1e7108357da80d44891221f..f5101f7218962f026aff7dd2d891cf7bc010a9ea 100644 (file)
--- a/grep.c
+++ b/grep.c
@@ -1650,7 +1650,7 @@ void grep_source_init(struct grep_source *gs, enum grep_source_type type,
                break;
        case GREP_SOURCE_SHA1:
                gs->identifier = xmalloc(20);
-               memcpy(gs->identifier, identifier, 20);
+               hashcpy(gs->identifier, identifier);
                break;
        case GREP_SOURCE_BUF:
                gs->identifier = NULL;

diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c
index 1218befaf2afa2f0be4be8a582a1f85bab334ed2..5f1791a59c5e9ecd553fb9109fa774d921f777c8 100644 (file)
--- a/pack-bitmap-write.c
+++ b/pack-bitmap-write.c
@@ -530,7 +530,7 @@ void bitmap_writer_finish(struct pack_idx_entry **index,
        header.version = htons(default_version);
        header.options = htons(flags | options);
        header.entry_count = htonl(writer.selected_nr);
-       memcpy(header.checksum, writer.pack_checksum, 20);
+       hashcpy(header.checksum, writer.pack_checksum);
 
        sha1write(f, &header, sizeof(header));
        dump_bitmap(f, writer.commits);

diff --git a/reflog-walk.c b/reflog-walk.c
index 2899729a8cbec4766182a1562c0c96d643de3a71..0dd5084fe5c80fe9504cfe4ec4bff3722b733eaf 100644 (file)
--- a/reflog-walk.c
+++ b/reflog-walk.c
@@ -28,8 +28,8 @@ static int read_one_reflog(unsigned char *osha1, unsigned char *nsha1,
 
        ALLOC_GROW(array->items, array->nr + 1, array->alloc);
        item = array->items + array->nr;
-       memcpy(item->osha1, osha1, 20);
-       memcpy(item->nsha1, nsha1, 20);
+       hashcpy(item->osha1, osha1);
+       hashcpy(item->nsha1, nsha1);
        item->email = xstrdup(email);
        item->timestamp = timestamp;
        item->tz = tz;

diff --git a/refs.c b/refs.c
index f89d589182fcfc595ff1d60f01ffe25e1ea81579..28d5eca8eaff7be48a4b89e6217886b8c96eb3b2 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -1222,7 +1222,7 @@ static int resolve_gitlink_packed_ref(struct ref_cache *refs,
        if (ref == NULL)
                return -1;
 
-       memcpy(sha1, ref->u.value.sha1, 20);
+       hashcpy(sha1, ref->u.value.sha1);
        return 0;
 }