Merge branch 'sh/use-hashcpy'

gitster · gitster · commit 006f678780e8 · 2014-03-18T13:51:05.000-07:00
* sh/use-hashcpy:
  Use hashcpy() when copying object names
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ static void add_to_ref_list(const unsigned char sha1, const char name,`
`15`	`15`	`struct ref_list *list)`
`16`	`16`	`{`
`17`	`17`	`ALLOC_GROW(list->list, list->nr + 1, list->alloc);`
`18`		`- memcpy(list->list[list->nr].sha1, sha1, 20);`
	`18`	`+ hashcpy(list->list[list->nr].sha1, sha1);`
`19`	`19`	`list->list[list->nr].name = xstrdup(name);`
`20`	`20`	`list->nr++;`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1222,7 +1222,7 @@ static int resolve_gitlink_packed_ref(struct ref_cache *refs,`
`1222`	`1222`	`if (ref == NULL)`
`1223`	`1223`	`return -1;`
`1224`	`1224`
`1225`		`- memcpy(sha1, ref->u.value.sha1, 20);`
	`1225`	`+ hashcpy(sha1, ref->u.value.sha1);`
`1226`	`1226`	`return 0;`
`1227`	`1227`	`}`
`1228`	`1228`